summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-09-12 13:14:34 -0400
committerRussell Teague <rteague@redhat.com>2017-09-12 13:14:34 -0400
commita77f2ffdd0b1f37de2877a63511d8682ab4362bc (patch)
tree1db969626547455a3b7404ad59b9df90672d1378
parentf8393b7aef78c92437fe78092821a8d0a11c22cc (diff)
downloadopenshift-a77f2ffdd0b1f37de2877a63511d8682ab4362bc.tar.gz
openshift-a77f2ffdd0b1f37de2877a63511d8682ab4362bc.tar.bz2
openshift-a77f2ffdd0b1f37de2877a63511d8682ab4362bc.tar.xz
openshift-a77f2ffdd0b1f37de2877a63511d8682ab4362bc.zip
Workaround Ansible Jinja2 delimiter warning
This workaround prevents the warnings on using Jinja2 templating delimiters in `when:` conditions in cases where a variable is used as the conditional. This has been fixed in Ansible 2.4. https://github.com/ansible/ansible/pull/25092
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml2
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index d73c290ff..3badede96 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 == True
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..08bf31515 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 == True
block:
- name: Ensure OpenShift router correctly rolls out (best-effort today)
command: |