From 7235c79cd0257c95a8a24388ffed0139be3a3ae9 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 7 Jul 2015 17:01:55 +0000
Subject: [PATCH] Reorg order in jenkins slave playbook as we need the user to
 exist before we use it.

---
 playbooks/groups/jenkins-cloud.yml | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml
index 35688aceb0..8f897d0507 100644
--- a/playbooks/groups/jenkins-cloud.yml
+++ b/playbooks/groups/jenkins-cloud.yml
@@ -489,6 +489,24 @@
     tags:
     - packages
 
+  - name: setup jenkins_slave user
+    action: user name=jenkins_slave state=present createhome=yes system=no
+    tags:
+    - jenkinsuser
+
+  - name: setup jenkins_slave ssh key
+    action: authorized_key user=jenkins_slave key="{{ item }}"
+    with_file:
+    - "{{ private }}/files/jenkins/ssh/jenkins_master.pub"
+
+  - name: jenkins_slave to mock group
+    action: user name=jenkins_slave groups=mock
+
+  - name: add .gitconfig for jenkins_slave user
+    action: copy src="{{ files }}/jenkins/gitconfig" dest=/home/jenkins_slave/.gitconfig owner=jenkins_slave group=jenkins_slave mode=664
+    tags:
+     - config
+
   - name: drop current android SDK
     when: is_fedora is defined
     action: file state=absent path=/var/android
@@ -522,24 +540,6 @@
     tags:
     - config
 
-  - name: setup jenkins_slave user
-    action: user name=jenkins_slave state=present createhome=yes system=no
-    tags:
-    - jenkinsuser
-
-  - name: setup jenkins_slave ssh key
-    action: authorized_key user=jenkins_slave key="{{ item }}"
-    with_file:
-    - "{{ private }}/files/jenkins/ssh/jenkins_master.pub"
-
-  - name: jenkins_slave to mock group
-    action: user name=jenkins_slave groups=mock
-
-  - name: add .gitconfig for jenkins_slave user
-    action: copy src="{{ files }}/jenkins/gitconfig" dest=/home/jenkins_slave/.gitconfig owner=jenkins_slave group=jenkins_slave mode=664
-    tags:
-     - config
-
   - name: template sshd_config
     copy: src="{{ item }}" dest=/etc/ssh/sshd_config mode=0600 owner=root group=root
     with_first_found: