Merge branch 'master' of /git/ansible

inventory/group_vars/secondary

@@ -9,5 +9,3 @@ nrpe_procs_crit: 1000
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600"
 
 fas_client_groups: sysadmin-noc,alt-sugar,alt-k12linux,altvideos,hosted-content,mips-content,s390_content,fi-apprentice,qa-deltaisos
-
-base_pkgs_inst: [ 'ntp', 'createrepo' ]

inventory/host_vars/bastion-comm01.qa.fedoraproject.org

@@ -1,2 +1,13 @@
 ---
 freezes: false
+nm: 255.255.255.0
+gw: 10.5.124.254
+dns: 10.5.126.21
+
+volgroup: /dev/VirtGuests
+
+eth0_ip: 10.5.124.132
+
+vmhost: virthost-comm03.qa.fedoraproject.org
+datacenter: phx2
+

playbooks/groups/bastion.yml

@@ -15,7 +15,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: make the boxen be real for real
-  hosts: bastion:!bastion-comm01.qa.fedoraproject.org
+  hosts: bastion
   user: root
   gather_facts: True
 
@@ -27,14 +27,13 @@
   roles:
   - base
   - rkhunter
-  - { role: denyhosts, when: ansible_distribution_major_version != '7' }
   - nagios_client
   - hosts
   - fas_client
   - sudo
   - collectd/base
-  - openvpn/server
+  - { role: openvpn/server, when: not inventory_hostname.startswith('bastion-comm01') }
-  - packager_alias
+  - { role: packager_alias, when: not inventory_hostname.startswith('bastion-comm01') }
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"

playbooks/groups/secondary.yml

@@ -60,12 +60,14 @@
     - alt.fedoraproject.org
     - archive.fedoraproject.org
     - archives.fedoraproject.org
-
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/apache.yml"
 
+  - name: Install createrepo
+    yum: pkg=createrepo state=present
+
   handlers:
   - include: "{{ handlers }}/restart_services.yml"