summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/README.md
diff options
context:
space:
mode:
authorTobias Brunner <tobias@tobru.ch>2017-05-19 13:27:50 +0200
committerScott Dodson <sdodson@redhat.com>2017-05-19 09:42:45 -0400
commit0ee812822a5fe5ba7cc00d00c58744104c2d9fee (patch)
tree506bde2bc0480c8a3ff9cdc15371612806fd2642 /roles/openshift_master/README.md
parentb61044dfa3669d79bd5e99c846ad4d10de172583 (diff)
downloadopenshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.gz
openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.bz2
openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.xz
openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.zip
allow to configure oreg_url specifically for node or master. refs #4233
This commit allows to specify imageConfig.format specifically for master or for nodes. One use case of this could be if you want to use customer builder images. In this case imageConfig.format only needs to be changed in the master-config.yml but not in the node-config.yml.
Diffstat (limited to 'roles/openshift_master/README.md')
-rw-r--r--roles/openshift_master/README.md21
1 files changed, 11 insertions, 10 deletions
diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md
index c3300a7ef..e5362105c 100644
--- a/roles/openshift_master/README.md
+++ b/roles/openshift_master/README.md
@@ -15,17 +15,18 @@ Role Variables
From this role:
-| Name | Default value | |
-|-------------------------------------|-----------------------|--------------------------------------------------|
-| openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for master |
+| Name | Default value | |
+|-------------------------------------|-----------------------|-------------------------------------------------------------------------------|
+| openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for master |
| openshift_node_ips | [] | List of the openshift node ip addresses to pre-register when master starts up |
-| oreg_url | UNDEF | Default docker registry to use |
-| openshift_master_api_port | UNDEF | |
-| openshift_master_console_port | UNDEF | |
-| openshift_master_api_url | UNDEF | |
-| openshift_master_console_url | UNDEF | |
-| openshift_master_public_api_url | UNDEF | |
-| openshift_master_public_console_url | UNDEF | |
+| oreg_url | UNDEF | Default docker registry to use |
+| oreg_url_master | UNDEF | Default docker registry to use, specifically on the master |
+| openshift_master_api_port | UNDEF | |
+| openshift_master_console_port | UNDEF | |
+| openshift_master_api_url | UNDEF | |
+| openshift_master_console_url | UNDEF | |
+| openshift_master_public_api_url | UNDEF | |
+| openshift_master_public_console_url | UNDEF | |
From openshift_common: