From: Sage Weil <sage@redhat.com>
Date: Wed, 27 May 2015 18:03:11 +0000 (-0700)
Subject: fabfile: set $dist to .el7 on centos 7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1eea802a31e96fdade40a374aa395da1ab64b428;p=autobuild-ceph.git

fabfile: set $dist to .el7 on centos 7

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/fabfile.py b/fabfile.py
index dbfa4c4..9f66906 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -168,7 +168,7 @@ def _rh_gitbuilder(flavor, git_repo, extra_remotes={}, extra_packages=[], ignore
             ' '.join([
                 'adduser',
                 '--system',
-                '--home', '/nonexistent',
+                '--home', '/home/autobuild-ceph',
                 '--comment', '"Ceph autobuild"',
                 '--user-group',
                 #'--disabled-password',
@@ -176,6 +176,8 @@ def _rh_gitbuilder(flavor, git_repo, extra_remotes={}, extra_packages=[], ignore
                 'autobuild-ceph',
                 ]),
             )
+        with cd('/home/autobuild-ceph'):
+            sudo('lsb_release -d -s | grep CentOS | grep -q release\ 7 && echo "%dist .el7" > .rpmmacros')
 
     sudo('install -d -m0755 --owner=root --group=root /srv/autobuild-ceph')
     local('git bundle create bundle refs/heads/{branch_to_bundle}'.format(branch_to_bundle=branch_to_bundle))