From 059638a80fa4c03bd9d545197f5495a27801c293 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 Jul 2015 20:17:24 +0000 Subject: [PATCH] Try and fix optional conditionals on vhost_update/reboot playbooks --- playbooks/vhost_reboot.yml | 6 +++--- playbooks/vhost_update.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 410cc52eba..2a84888545 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -35,7 +35,7 @@ # Call out to another playbook. Disable any proxies that may live here - include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - when: not "true" in nodns + when: nodns is not defined or not "true" in nodns - name: halt instances hosts: myvms_new @@ -48,7 +48,7 @@ nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} delegate_to: noc01.phx2.fedoraproject.org ignore_errors: true - when: not "true" in nonagios + when: nonagios is not defined or not "true" in nonagios - name: halt the vm instances - to poweroff command: /sbin/shutdown -h 1 @@ -74,7 +74,7 @@ nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }} delegate_to: noc01.phx2.fedoraproject.org ignore_errors: true - when: not "true" in nonagios + when: nonagios is not defined or not "true" in nonagios - name: reboot the virthost command: /sbin/shutdown -r 1 diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index 7eb987d8d3..bdaad5a345 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -20,7 +20,7 @@ # Call out to another playbook. Disable any proxies that may live here - include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - when: not "true" in nodns + when: nodns is not defined or not "true" in nodns - name: update the system hosts: "{{ target }}:myvms_new" @@ -32,7 +32,7 @@ nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} delegate_to: noc01.phx2.fedoraproject.org ignore_errors: true - when: not "true" in nonagios + when: nonagios is not defined or not "true" in nonagios - name: expire-caches command: yum clean expire-cache