From 9a545398142bc01f31380667b734f603c85683ba Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 25 Nov 2013 18:08:13 +0000
Subject: [PATCH] Fix up bkernel playbooks some more. Use base role.

---
 playbooks/groups/bkernel.yml | 8 +++-----
 tasks/koji/bkernel-setup.yml | 3 ---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/playbooks/groups/bkernel.yml b/playbooks/groups/bkernel.yml
index 65cbd4b3f7..96919b8b26 100644
--- a/playbooks/groups/bkernel.yml
+++ b/playbooks/groups/bkernel.yml
@@ -12,18 +12,16 @@
    - ${private}/vars.yml
    - ${vars}/${ansible_distribution}.yml
 
+  roles:
+  - /srv/web/infra/ansible/roles/base
+
   tasks:
   - include: $tasks/koji/base_builder.yml
   - include: $tasks/koji/builder_kernel_config.yml
   - include: $tasks/koji/bkernel-setup.yml
 
-
   handlers:
   - include: $handlers/restart_services.yml
 
   - name: restart kojid
     action: service name=kojid state=restarted
-  
-
-
-
diff --git a/tasks/koji/bkernel-setup.yml b/tasks/koji/bkernel-setup.yml
index 458ffd9a6e..50501160ec 100644
--- a/tasks/koji/bkernel-setup.yml
+++ b/tasks/koji/bkernel-setup.yml
@@ -27,9 +27,6 @@
 - 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: put hw reinstall onto bkernel boxes since they are raw hw
-  action: copy src=$files/common-scripts/hardware-reinstall dest=/usr/local/bin/hardware-reinstall mode=0750 owner=root group=root
-
 - 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