Reorg buildvm/releng playbooks to use base and not duplicate parts of it.

tasks/hosts.yml

@@ -12,7 +12,7 @@
 - name: setup /etc/hosts for some clients
   action: copy src=$item dest=/etc/hosts
   with_first_found:
-  - files: $files/hosts/${ansible_fqdn}-hosts $files/hosts/${ansible_hostname}-hosts $files/hosts/${ansible_domain}-hosts
+  - files: $files/hosts/{{ ansible_fqdn }}-hosts $files/hosts/{{ ansible_hostname }}-hosts $files/hosts/{{ ansible_domain }}-hosts $files/hosts/{{ host_group }}-hosts
     skip: true
   tags:
   - config

tasks/koji/base_builder.yml

@@ -1,10 +1,3 @@
-- name: enforce certain packages previously assumed from kickstarts
-  action: yum name=$item state=installed
-  with_items:
-  - postfix
-  - joe
-  - perl
-
 - name: set root passwd
   action: user name=root password=$builder_rootpw state=present
 
@@ -32,32 +25,6 @@
 - name: mockbuilder ssh key
   action: copy src=$files/kojibuilder/ftbfs_auth_keys dest=/home/mockbuilder/.ssh/authorized_keys mode=644 owner=mockbuilder group=mockbuilder
 
-- name: iptables
-  action: template src=$files/iptables/kojibuilder dest=/etc/sysconfig/iptables mode=600
-  notify:
-  - restart iptables
-
-- name: sshd_config
-  action: copy src=$files/ssh/sshd_config.kojibuilder dest=/etc/ssh/sshd_config mode=600
-  notify:
-  - restart sshd
-
-- name: /etc/resolv.conf
-  action: copy src=$files/resolv.conf/kojibuilder dest=/etc/resolv.conf
-
-- name: add to hosts
-  action: copy src=$files/hosts/kojibuilder-hosts dest=/etc/hosts
-
-- name: rsyslog.conf
-  action: copy src=$files/rsyslog/rsyslog.conf.kojibuilder dest=/etc/rsyslog.conf mode=644
-  notify:
-  - restart rsyslog
-
-- name: /etc/postfix/main.cf
-  action: copy src=$files/postfix/main.cf.norelay dest=/etc/postfix/main.cf
-  notify:
-  - restart postfix
-
 - name: make a bunch of dirs
   action: file state=directory path=$item
   with_items:

tasks/koji/releng_config.yml

@@ -36,7 +36,6 @@
 - name: add masher ssh priv key
   action: copy src=$private/files/mash/masher.id_rsa dest=/home/masher/.ssh/id_rsa mode=600 owner=masher group=masher
 
-
 # rawhide group
 - name: rawhide group
   action: group name=rawhide gid=265
@@ -44,46 +43,6 @@
 - name: add rawhide user
   action: user name=rawhide uid=265 group=rawhide home=/tmp comment="rawhide compose account"
  
-
-- name: iptables
-  action: template src=$files/iptables/releng dest=/etc/sysconfig/iptables mode=600
-  notify:
-  - restart iptables
-  tags:
-  - configs
-
-- name: sshd_config
-  action: copy src=$files/ssh/sshd_config.releng dest=/etc/ssh/sshd_config mode=600
-  notify:
-  - restart sshd
-  tags:
-  - sshd_config
-  - configs
-
-- name: /etc/resolv.conf
-  action: copy src=$files/resolv.conf/phx2 dest=/etc/resolv.conf
-  tags:
-  - configs
-
-- name: /etc/hosts
-  action: copy src=$files/hosts/releng-hosts dest=/etc/hosts
-  tags:
-  - configs
-
-
-- name: rsyslog.conf
-  action: copy src=$files/rsyslog/rsyslog.conf.releng dest=/etc/rsyslog.conf mode=644
-  tags:
-  - configs
-
-- name: /etc/postfix/main.cf
-  action: copy src=$files/postfix/main.cf.releng01 dest=/etc/postfix/main.cf
-  tags:
-  - configs
-
-- name: ensure postfix is started
-  action: service name=postfix state=started enabled=true
-
 - name: make a bunch of dirs
   action: file state=directory path=$item
   with_items:
@@ -249,4 +208,3 @@
   tags:
   - fedmsg
   only_if: "'${inventory_hostname}'.startswith('releng02')"
-