diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-30 21:18:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 21:18:49 -0400 |
commit | cab9134c4ff7dcc52dda75c94e13874d9ec9083d (patch) | |
tree | 71dd1945e2b202d9b5fc2371291a4d6f9555ecd3 /roles/openshift_hosted/defaults | |
parent | 248cba6458e7be7463a29b43151879925fdea316 (diff) | |
parent | 3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6 (diff) | |
download | openshift-cab9134c4ff7dcc52dda75c94e13874d9ec9083d.tar.gz openshift-cab9134c4ff7dcc52dda75c94e13874d9ec9083d.tar.bz2 openshift-cab9134c4ff7dcc52dda75c94e13874d9ec9083d.tar.xz openshift-cab9134c4ff7dcc52dda75c94e13874d9ec9083d.zip |
Merge pull request #5230 from kwoodson/openshift_node_bootstrap
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_hosted/defaults')
-rw-r--r-- | roles/openshift_hosted/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml index f3747eead..c26df3afa 100644 --- a/roles/openshift_hosted/defaults/main.yml +++ b/roles/openshift_hosted/defaults/main.yml @@ -5,8 +5,8 @@ r_openshift_hosted_router_use_firewalld: "{{ os_firewall_use_firewalld | default r_openshift_hosted_registry_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_hosted_registry_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" -openshift_hosted_router_wait: True -openshift_hosted_registry_wait: True +openshift_hosted_router_wait: "{{ not openshift_master_bootstrap_enabled | default(True) }}" +openshift_hosted_registry_wait: "{{ not openshift_master_bootstrap_enabled | default(True) }}" registry_volume_claim: 'registry-claim' |