From 25e96c97c99475e507878b9c4aa24186872f127e Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 29 Sep 2015 18:14:08 +0000
Subject: [PATCH] and we have some configs

---
 ...autocloud-backend02.phx2.fedoraproject.org | 21 ++++++++++++-------
 playbooks/groups/autocloud-backend.yml        |  2 +-
 ...data-analysis01.phx2.fedoraproject.org.yml | 19 ++++++++++-------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/inventory/host_vars/autocloud-backend02.phx2.fedoraproject.org b/inventory/host_vars/autocloud-backend02.phx2.fedoraproject.org
index 50926eeba9..53e145c21f 100644
--- a/inventory/host_vars/autocloud-backend02.phx2.fedoraproject.org
+++ b/inventory/host_vars/autocloud-backend02.phx2.fedoraproject.org
@@ -1,15 +1,22 @@
 ---
+---
+# this box is not mission critical
+freezes: false
+
+# this box mounts a large share from the netapp to store combined http
+# logs from the proxies.
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+
+# general configs
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+datacenter: phx2
 nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
-
-eth0_ip: 10.5.126.124
-
-volgroup: /dev/vg_guests
-vmhost: virthost19.phx2.fedoraproject.org
+eth0_ip: 10.5.126.122
 
 datacenter: phx2
 
diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml
index 3bcedaf848..caa948994a 100644
--- a/playbooks/groups/autocloud-backend.yml
+++ b/playbooks/groups/autocloud-backend.yml
@@ -1,4 +1,4 @@
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend:autocloud-backend-stg"
+- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend01.phx2.fedoraproject.org:autocloud-backend-stg"
 
 - name: dole out the generic configuration
   hosts: autocloud-backend;autocloud-backend-stg
diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
index 2b85bcbb8f..0b62c5c65a 100644
--- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
+++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
@@ -1,26 +1,28 @@
 # This is a basic playbook
 
-- name: make basic box
+- name: dole out the generic configuration
   hosts: data-analysis01.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
-  vars_files: 
+  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 }}/yumrepos.yml"
+
   roles:
   - base
   - rkhunter
-  - nagios_client
   - hosts
   - fas_client
+  - nagios_client
   - collectd/base
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
 
@@ -28,16 +30,17 @@
   - include: "{{ handlers }}/restart_services.yml"
   - include: "{{ handlers }}/semanage.yml"
 
-- name: get the system ready for data handling.
+- name: dole out the service-specific config
   hosts: data-analysis01.phx2.fedoraproject.org
   user: root
   gather_facts: True
-
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-  
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
+
   roles:
    - { role: nfs/client,  mnt_dir: '/srv/fedora_stats',  nfs_src_dir: 'fedora_stats' }
    - geoip