From d301595323328476b39158dd72397378920ec192 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Mon, 1 May 2017 16:09:41 +0000
Subject: remove some of the confusion from names

---
 playbooks/groups/nagios-new.yml | 60 -----------------------------------------
 playbooks/groups/noc-new.yml    | 60 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 playbooks/groups/nagios-new.yml
 create mode 100644 playbooks/groups/noc-new.yml

diff --git a/playbooks/groups/nagios-new.yml b/playbooks/groups/nagios-new.yml
deleted file mode 100644
index f5818504f..000000000
--- a/playbooks/groups/nagios-new.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# This is a basic playbook
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios-new"
-
-- name: make the box be real
-  hosts: nagios-new
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - include: "{{ tasks_path }}/yumrepos.yml"
-
-  roles:
-  - base
-  - rkhunter
-  - nagios_client
-  - hosts
-  - fas_client
-  - collectd/base
-  - { role: rsyncd, when: datacenter == 'phx2' }
-  - sudo
-  - { role: openvpn/client,
-      when: env != "staging" }
-  - mod_wsgi
-  - role: keytab/service
-    owner_user: apache
-    owner_group: apache
-    service: HTTP
-    host: "nagios{{env_suffix}}.fedoraproject.org"
-
-  tasks:
-  - include: "{{ tasks_path }}/2fa_client.yml"
-  - include: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - include: "{{ handlers_path }}/restart_services.yml"
-
-- name: deploy service-specific config (just for production)
-  hosts: nagios
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /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"
-
-  handlers:
-  - include: "{{ handlers_path }}/restart_services.yml"
-
-  roles:
-  - { role: dhcp_server, when: datacenter == 'phx2' }
-  - { role: tftp_server, when: datacenter == 'phx2' }
-  - nagios/server
-  - fedmsg/base
diff --git a/playbooks/groups/noc-new.yml b/playbooks/groups/noc-new.yml
new file mode 100644
index 000000000..f5818504f
--- /dev/null
+++ b/playbooks/groups/noc-new.yml
@@ -0,0 +1,60 @@
+# This is a basic playbook
+- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios-new"
+
+- name: make the box be real
+  hosts: nagios-new
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "/srv/private/ansible/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  pre_tasks:
+  - include: "{{ tasks_path }}/yumrepos.yml"
+
+  roles:
+  - base
+  - rkhunter
+  - nagios_client
+  - hosts
+  - fas_client
+  - collectd/base
+  - { role: rsyncd, when: datacenter == 'phx2' }
+  - sudo
+  - { role: openvpn/client,
+      when: env != "staging" }
+  - mod_wsgi
+  - role: keytab/service
+    owner_user: apache
+    owner_group: apache
+    service: HTTP
+    host: "nagios{{env_suffix}}.fedoraproject.org"
+
+  tasks:
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
+
+  handlers:
+  - include: "{{ handlers_path }}/restart_services.yml"
+
+- name: deploy service-specific config (just for production)
+  hosts: nagios
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /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"
+
+  handlers:
+  - include: "{{ handlers_path }}/restart_services.yml"
+
+  roles:
+  - { role: dhcp_server, when: datacenter == 'phx2' }
+  - { role: tftp_server, when: datacenter == 'phx2' }
+  - nagios/server
+  - fedmsg/base
-- 
cgit