Merge pull request #5379 from mtnbikenc/fix-jinja2-openshift_hosted

Merged by openshift-bot

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'
 

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: |

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: |