From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 15 Jan 2016 14:18:25 +0000 (-0500)
Subject: set the macros after installing dependencies
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F297%2Fhead;p=ceph-build.git

set the macros after installing dependencies

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 34177272..8362f3d8 100644
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -36,16 +36,6 @@
     - name: ensure the build dir has the right owner permissions
       file: path=/home/{{ jenkins_user }}/build state=directory owner={{ jenkins_user }}
 
-    - name: ensure the rpmmacros file exists to fix centos builds
-      file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch
-
-    - name: write the rpmmacros needed in centos
-      lineinfile:
-        dest: "/home/{{ jenkins_user }}/.rpmmacros"
-        regexp: '^%dist'
-        line: '%dist .el{{ ansible_lsb.major_release }}'
-      when: ansible_pkg_mgr  == "yum"
-
     - name: Install RPM requirements
       sudo: yes
       yum: name={{ item }} state=present
@@ -112,6 +102,16 @@
         - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
+    - name: ensure the rpmmacros file exists to fix centos builds
+      file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch
+
+    - name: write the rpmmacros needed in centos
+      lineinfile:
+        dest: "/home/{{ jenkins_user }}/.rpmmacros"
+        regexp: '^%dist'
+        line: '%dist .el{{ ansible_lsb.major_release }}'
+      when: ansible_pkg_mgr  == "yum"
+
     - name: install six, latest one
       sudo: true
       pip: name=six state=latest