summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-26 19:10:39 -0500
committerGitHub <noreply@github.com>2017-05-26 19:10:39 -0500
commitc5f4a60fdd9ebc81180a96677717ca96b9badc72 (patch)
tree65ad8f8384f37ea8f57faa165ddf5391680f7633 /roles/openshift_master
parent670ee735410691c5e2f2709aa17bb2e8e5be3e84 (diff)
parent0ee812822a5fe5ba7cc00d00c58744104c2d9fee (diff)
downloadopenshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.gz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.bz2
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.xz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.zip
Merge pull request #4234 from vshn/feature/oreg_url_masternode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master')
-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: