From b6190a17b578de72147e481b0eea00aca59adc2f Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 21 Apr 2017 13:30:53 -0400 Subject: Remove jinja template delimeters from when conditions In ansible 2.3 "[WARNING]: when statements should not include jinja2 templating delimiters such as {{ }} or {% %}. Found: {{ g_glusterfs_hosts is not defined }}" --- playbooks/adhoc/uninstall.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'playbooks/adhoc/uninstall.yml') diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index ffdcd0ce1..8f0341759 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -125,7 +125,7 @@ - name: Remove flannel package package: name=flannel state=absent when: openshift_use_flannel | default(false) | bool - when: "{{ not is_atomic | bool }}" + when: "not is_atomic | bool" - shell: systemctl reset-failed changed_when: False @@ -146,7 +146,7 @@ - lbr0 - vlinuxbr - vovsbr - when: "{{ openshift_remove_all | default(true) | bool }}" + when: "openshift_remove_all | default(true) | bool" - shell: atomic uninstall "{{ item }}"-master-api changed_when: False @@ -239,7 +239,7 @@ changed_when: False failed_when: False with_items: "{{ images_to_delete.results }}" - when: "{{ openshift_uninstall_images | default(True) | bool }}" + when: "openshift_uninstall_images | default(True) | bool" - name: remove sdn drop files file: @@ -252,7 +252,7 @@ - /etc/sysconfig/openshift-node - /etc/sysconfig/openvswitch - /run/openshift-sdn - when: "{{ openshift_remove_all | default(True) | bool }}" + when: "openshift_remove_all | default(True) | bool" - find: path={{ item }} file_type=file register: files -- cgit v1.2.3 From 717c36fde2639f6f3cc7bf534052e1df0479c2fe Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 27 Apr 2017 09:31:41 -0400 Subject: Don't double quote when conditions --- playbooks/adhoc/uninstall.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'playbooks/adhoc/uninstall.yml') diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 8f0341759..beaf20b07 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -125,7 +125,7 @@ - name: Remove flannel package package: name=flannel state=absent when: openshift_use_flannel | default(false) | bool - when: "not is_atomic | bool" + when: not is_atomic | bool - shell: systemctl reset-failed changed_when: False @@ -146,7 +146,7 @@ - lbr0 - vlinuxbr - vovsbr - when: "openshift_remove_all | default(true) | bool" + when: openshift_remove_all | default(true) | bool - shell: atomic uninstall "{{ item }}"-master-api changed_when: False @@ -239,7 +239,7 @@ changed_when: False failed_when: False with_items: "{{ images_to_delete.results }}" - when: "openshift_uninstall_images | default(True) | bool" + when: openshift_uninstall_images | default(True) | bool - name: remove sdn drop files file: @@ -252,7 +252,7 @@ - /etc/sysconfig/openshift-node - /etc/sysconfig/openvswitch - /run/openshift-sdn - when: "openshift_remove_all | default(True) | bool" + when: openshift_remove_all | default(True) | bool - find: path={{ item }} file_type=file register: files -- cgit v1.2.3