Fold bkernel into buildhw with it's own role.

7 files changed, 34 insertions, 60 deletions

diff --git a/playbooks/groups/bkernel.yml b/playbooks/groups/bkernel.yml
deleted file mode 100644
index ac67cdf5f..000000000
--- a/playbooks/groups/bkernel.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# provision a new koji bkernel 
-# NOTE: this assumes the bkernel boxes are already up and are accessible
-# NOTE: most of these vars_path come from group_vars/bkernel or from hostvars
-
-- name: make koji bkernel
-  hosts: bkernel
-  user: root
-  gather_facts: True
-
-  vars_files: 
-   - /srv/web/infra/ansible/vars/global.yml
-   - "{{ private }}/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - base
-  - koji_builder
-
-  tasks:
-  - include: "{{ tasks }}/koji/bkernel-setup.yml"
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"
-
-  - name: restart kojid
-    action: service name=kojid state=restarted
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index b1509a48b..a7e7b6277 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -3,7 +3,7 @@
 # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars
 
 - name: make koji builder(s) on raw hw
-  hosts: buildhw;buildppc;buildarm
+  hosts: buildhw;buildppc;buildarm:bkernel
   user: root
   gather_facts: True
 
@@ -14,8 +14,9 @@
 
   roles:
   - base
-  - { role: nfs_client, when: not inventory_hostname.startswith('arm'), mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
+  - { role: nfs_client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
   - koji_builder
+  - { role: bkernel, when: inventory_hostname.startswith('bkernel') }
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
diff --git a/roles/koji_builder/files/builders/bkernel-site-defaults.cfg b/roles/bkernel/files/bkernel-site-defaults.cfg
index fe4279fb3..fe4279fb3 100644
--- a/roles/koji_builder/files/builders/bkernel-site-defaults.cfg
+++ b/roles/bkernel/files/bkernel-site-defaults.cfg
diff --git a/roles/koji_builder/files/history_off.sh b/roles/bkernel/files/history_off.sh
index be7ee75a3..be7ee75a3 100644
--- a/roles/koji_builder/files/history_off.sh
+++ b/roles/bkernel/files/history_off.sh
diff --git a/roles/bkernel/tasks/main.yml b/roles/bkernel/tasks/main.yml
new file mode 100644
index 000000000..6be00533e
--- /dev/null
+++ b/roles/bkernel/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: add pkgs for bkernel boxes
+  yum: state=latest pkg={{ item }}
+  with_items:
+    - pesign
+    - ccid
+    - pcsc-lite
+    - pcsc-lite-libs
+    - opensc
+    - nss-tools
+
+- name: enable pcscd
+  service: name=pcscd state=running enabled=1
+
+- name: setup opensc in pcscd
+  shell: modutil -dbdir /etc/pki/pesign -list | grep -q Fedora ||  modutil -force -dbdir /etc/pki/pesign -add opensc -libfile /usr/lib64/pkcs11/opensc-pkcs11.so
+
+- name: /var/run/pesign perms
+  file: state=directory path=/var/run/pesign owner=pesign group=pesign mode=0770
+
+- name: enable pesign
+  service: name=pesign state=started enabled=true
+
+- name: when you awake you will remember nothing
+  copy: src=history_off.sh dest=/etc/profile.d/history_off.sh mode=0644
+
+- name: mock site-defaults.cfg
+  copy: src=bkernel-site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
+
+- name: make sure our bkernel boxes have static ip
+  template: src=bkernel-eth0-network dest=/etc/sysconfig/network-scripts/ifcfg-eth0 
diff --git a/roles/koji_builder/files/builders/bkernel-eth0-network b/roles/bkernel/templates/bkernel-eth0-network
index 3ba815a9b..3ba815a9b 100644
--- a/roles/koji_builder/files/builders/bkernel-eth0-network
+++ b/roles/bkernel/templates/bkernel-eth0-network
diff --git a/tasks/koji/bkernel-setup.yml b/tasks/koji/bkernel-setup.yml
deleted file mode 100644
index 11f392f5f..000000000
--- a/tasks/koji/bkernel-setup.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- name: add pkgs for bkernel boxes
-  action: yum state=latest pkg={{ item }} enablerepo=epel-test
-  with_items:
-    - pesign
-    - ccid
-    - pcsc-lite
-    - pcsc-lite-libs
-    - opensc
-    - nss-tools
-
-- name: enable pcscd
-  action: service name=pcscd state=running enabled=1
-
-- name: setup opensc in pcscd
-  action: shell modutil -dbdir /etc/pki/pesign -list | grep -q Fedora ||  modutil -force -dbdir /etc/pki/pesign -add opensc -libfile /usr/lib64/pkcs11/opensc-pkcs11.so
-
-- name: /var/run/pesign perms
-  action: file state=directory path=/var/run/pesign owner=pesign group=pesign mode=0770
-
-- name: enable pesign
-  action: service name=pesign state=started enabled=true
-
-- name: when you awake you will remember nothing
-  action: copy src="{{ files }}/kojibuilder/history_off.sh" dest=/etc/profile.d/history_off.sh mode=0644
-
-- name: mock site-defaults.cfg
-  action: copy src="{{ files }}/kojibuilder/builders/bkernel-site-defaults.cfg" dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
-
-- name: make sure our bkernel boxes have static ip
-  action: template src="{{ files }}/kojibuilder/builders/bkernel-eth0-network" dest=/etc/sysconfig/network-scripts/ifcfg-eth0 
-