From 74b1bcc53f4c85e8611d40aa013a2ea1a1bd3ea0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 Jul 2015 21:10:04 +0000 Subject: [PATCH] Disable dns include for now and fix up some more nonagios conditionals --- playbooks/vhost_reboot.yml | 2 +- playbooks/vhost_update.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 2a84888545..b0ad4c3cc0 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -100,7 +100,7 @@ nagios: action=unsilence 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 # Call out to that dns playbook. Put proxies back in now that they're back - include: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index bdaad5a345..942732c722 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -19,8 +19,7 @@ with_items: vmlist.list_vms # Call out to another playbook. Disable any proxies that may live here -- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - when: nodns is not defined or not "true" in nodns +#- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - name: update the system hosts: "{{ target }}:myvms_new"