From e79ac4e6b38ef8d2dcb321ff1a487932f37d8521 Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Tue, 19 Mar 2013 20:09:25 +0000
Subject: [PATCH] make sure we growroot new instances

---
 playbooks/el6-temp-instance.yml  |  1 +
 playbooks/groups/kojibuilder.yml | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/playbooks/el6-temp-instance.yml b/playbooks/el6-temp-instance.yml
index e8ad77bab3..853833095a 100644
--- a/playbooks/el6-temp-instance.yml
+++ b/playbooks/el6-temp-instance.yml
@@ -29,6 +29,7 @@
    - ${vars}/${ansible_distribution}.yml
 
   tasks:
+  - include: $tasks/growroot_cloud.yml
   - include: $tasks/cloud_setup_basic.yml
 
 
diff --git a/playbooks/groups/kojibuilder.yml b/playbooks/groups/kojibuilder.yml
index 4b90767fa1..25b10653ab 100644
--- a/playbooks/groups/kojibuilder.yml
+++ b/playbooks/groups/kojibuilder.yml
@@ -25,22 +25,21 @@
     action: user name=mock uid=425 state=present home=/var/lib/mock createhome=yes system=yes
   - name: make mock homedir perms
     action: file state=directory path=/var/lib/mock mode=2775 owner=root group=mock
-    tags:
-    - mock_homedir_perms
   - name: add mock ssh dir
     action: file state=directory path=/var/lib/mock/.ssh mode=700 owner=mock group=mock
-    tags:
-    - mock_sshdir_perms
+
+  # FIXME - authkeys
   - name: add mock ssh keys
     action: copy src=$configs/mock_auth_keys dest=/var/lib/mock/.ssh/authorized_keys mode=640 owner=mock group=mock
-    tags:
-     - mock_ssh_keys
+
   - name: add kojibuilder
     action: user name=kojibuilder groups=mock 
   - name: add mockbuilder
     action: user name=mockbuilder groups=mock
   - name: mockbuilder .ssh dir
     action: file state=directory path=/home/mockbuilder/.ssh mode=700 owner=mockbuilder group=mockbuilder
+
+  # FIXME authkeys
   - name: mockbuilder ssh key
     action: copy src=$configs/ftbfs_auth_keys dest=/home/mockbuilder/.ssh/authorized_keys mode=644 owner=mockbuilder group=mockbuilder
   - name: iptables
@@ -51,8 +50,6 @@
     action: copy src=$configs/sshd_config dest=/etc/ssh/sshd_config mode=600
     notify:
     - restart sshd
-    tags:
-    - sshd_config
   - name: /etc/resolv.conf
     action: copy src=$configs/resolv.conf dest=/etc/resolv.conf