Disable dns include for now and fix up some more nonagios conditionals

This commit is contained in:
Kevin Fenzi 2015-07-23 21:10:04 +00:00
parent 059638a80f
commit 74b1bcc53f
2 changed files with 2 additions and 3 deletions

View file

@ -100,7 +100,7 @@
nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
delegate_to: noc01.phx2.fedoraproject.org delegate_to: noc01.phx2.fedoraproject.org
ignore_errors: true 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 # 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 - include: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies

View file

@ -19,8 +19,7 @@
with_items: vmlist.list_vms with_items: vmlist.list_vms
# Call out to another playbook. Disable any proxies that may live here # Call out to another playbook. Disable any proxies that may live here
- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies #- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies
when: nodns is not defined or not "true" in nodns
- name: update the system - name: update the system
hosts: "{{ target }}:myvms_new" hosts: "{{ target }}:myvms_new"