From 097b7feda6dc2c08a9cf107ae7444c28e399d85f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jul 24 2014 02:30:25 +0000 Subject: Try this. --- diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index d39e559..3256202 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -59,6 +59,7 @@ - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + - /srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml handlers: - include: "{{ handlers }}/restart_services.yml" @@ -66,6 +67,6 @@ roles: - { role: dhcp_server, when: datacenter == 'phx2' } - { role: tftp_server, when: datacenter == 'phx2' } - - { role: nagios_server, nagios_srcdir: 'nagios', when: datacenter == 'phx2' } - - { role: nagios_server, nagios_srcdir: 'nagios-external', when: datacenter != 'phx2' } + - { role: nagios_server, when: datacenter == 'phx2' } + - { role: nagios_server, when: datacenter != 'phx2' } - fedmsg/base diff --git a/vars/nagios.noc01.yml b/vars/nagios.noc01.yml new file mode 100644 index 0000000..55868f7 --- /dev/null +++ b/vars/nagios.noc01.yml @@ -0,0 +1,2 @@ +--- +nagios_srcdir: 'nagios' diff --git a/vars/nagios.noc02.yml b/vars/nagios.noc02.yml new file mode 100644 index 0000000..c10331c --- /dev/null +++ b/vars/nagios.noc02.yml @@ -0,0 +1,2 @@ +--- +nagios_srcdir: 'nagios-external'