From 92cfa47aad0e18ac867998f339accd8474099eb2 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Nov 12 2015 22:02:38 +0000
Subject: Try this as inventory_hostname as it doesn't like _short


---

diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index f444407..610b2d2 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -42,7 +42,7 @@
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-   - /srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml
+   - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname }}.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
diff --git a/vars/nagios.noc01.phx2.fedoraproject.org.yml b/vars/nagios.noc01.phx2.fedoraproject.org.yml
new file mode 100644
index 0000000..55868f7
--- /dev/null
+++ b/vars/nagios.noc01.phx2.fedoraproject.org.yml
@@ -0,0 +1,2 @@
+---
+nagios_srcdir: 'nagios'
diff --git a/vars/nagios.noc01.yml b/vars/nagios.noc01.yml
deleted file mode 100644
index 55868f7..0000000
--- a/vars/nagios.noc01.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nagios_srcdir: 'nagios'
diff --git a/vars/nagios.noc02.fedoraproject.org.yml b/vars/nagios.noc02.fedoraproject.org.yml
new file mode 100644
index 0000000..c10331c
--- /dev/null
+++ b/vars/nagios.noc02.fedoraproject.org.yml
@@ -0,0 +1,2 @@
+---
+nagios_srcdir: 'nagios-external'
diff --git a/vars/nagios.noc02.yml b/vars/nagios.noc02.yml
deleted file mode 100644
index c10331c..0000000
--- a/vars/nagios.noc02.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nagios_srcdir: 'nagios-external'