Pull builder kernel task into koji_builder role.

3 files changed, 33 insertions, 38 deletions

diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index be85d288d..ccd72ed32 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -22,23 +22,3 @@
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
-
-- name: make koji builder(s) on raw hw
-  hosts: buildhw
-  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
-
-  tasks:
-  - include: "{{ tasks }}/hosts.yml"
-  - include: "{{ tasks }}/koji/builder_kernel_config.yml"
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index ffa95265d..9c666c4a2 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -135,6 +135,39 @@
 - name: ntp.conf
   copy: src="{{ files }}/common/ntp.conf" dest=/etc/ntp.conf
 
+#
+# We want more loop devices on builders to allow more image creates
+#
+
+- name: check for max_loop with grub2
+  command: cat /etc/grub2.cfg
+  register: max_loop
+  always_run: yes
+  changed_when: '1 != 1'
+  when: is_fedora == 'True'
+
+- name: check for max_loop with grub1
+  command: cat /etc/grub.cfg
+  register: max_loop
+  always_run: yes
+  changed_when: '1 != 1'
+  when: is_rhel == 'True'
+
+- name: set kernel params for more loops
+  action: command /sbin/grubby --update-kernel=ALL --args=max_loop=64 
+  when: max_loop.stdout.find("max_loop=64") == -1
+
+#
+# x86_64 builders run pungify, that needs hfs module in order to make
+# The efi/mac images. This module is only needed on rhel. 
+#
+
+- name: special pkgs for the x86_64 builders
+  yum: state=installed pkg={{ item }}
+  with_items:
+  - kmod-hfsplus    
+  when: is_rhel == 'True'
+
 - name: enable services and start them
   service: name={{ item }}  enabled=true state=started
   with_items:
diff --git a/tasks/koji/builder_kernel_config.yml b/tasks/koji/builder_kernel_config.yml
deleted file mode 100644
index b2b1ca31f..000000000
--- a/tasks/koji/builder_kernel_config.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-#- name: set kernel params for loopback partitioning
-#  action: command /sbin/grubby --update-kernel=ALL --args=loop.max_part=256 
-#
-- name: check for max_loop
-  command: cat /etc/grub2.cfg
-  register: max_loop
-  always_run: yes
-  changed_when: '1 != 1'
-
-- name: set kernel params for more loops
-  action: command /sbin/grubby --update-kernel=ALL --args=max_loop=64 
-  when: max_loop.stdout.find("max_loop=64") == -1
-
-- name: special pkgs for the x86_64 builders
-  yum: state=installed pkg={{ item }}
-  with_items:
-  - kmod-hfsplus    
-  when: is_rhel == 'True'