diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-13 13:19:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 13:19:59 -0400 |
| commit | 665c5c2058b989a58a99022be198e9c7a6383a1a (patch) | |
| tree | 81c81f127edc4a64268f746f6bb003eccad2f963 | |
| parent | ed6be0b233a107706b904354a9bba6e0d3d13472 (diff) | |
| parent | d10f1cdd7baa26f9ce0e5fba1e7599cf07505aa1 (diff) | |
| download | openshift-665c5c2058b989a58a99022be198e9c7a6383a1a.tar.gz openshift-665c5c2058b989a58a99022be198e9c7a6383a1a.tar.bz2 openshift-665c5c2058b989a58a99022be198e9c7a6383a1a.tar.xz openshift-665c5c2058b989a58a99022be198e9c7a6383a1a.zip | |
Merge pull request #5379 from mtnbikenc/fix-jinja2-openshift_hosted
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_hosted/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml index 08c1d849e..712a2a591 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: "{{ not openshift_master_bootstrap_enabled | default(True) }}" -openshift_hosted_registry_wait: "{{ not openshift_master_bootstrap_enabled | default(True) }}" +openshift_hosted_router_wait: "{{ not (openshift_master_bootstrap_enabled | default(False)) }}" +openshift_hosted_registry_wait: "{{ not (openshift_master_bootstrap_enabled | default(False)) }}" registry_volume_claim: 'registry-claim' diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index d73c290ff..48f53aef8 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -137,7 +137,7 @@ edits: "{{ openshift_hosted_registry_edits }}" force: "{{ True|bool in openshift_hosted_registry_force }}" -- when: openshift_hosted_registry_wait +- when: openshift_hosted_registry_wait | bool block: - name: Ensure OpenShift registry correctly rolls out (best-effort today) command: | diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index 68ec7233e..2a42b5a7c 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -94,7 +94,7 @@ stats_port: "{{ item.stats_port }}" with_items: "{{ openshift_hosted_routers }}" -- when: openshift_hosted_router_wait +- when: openshift_hosted_router_wait | bool block: - name: Ensure OpenShift router correctly rolls out (best-effort today) command: | |