From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Jun 2015 17:34:20 +0000 (-0700)
Subject: fabfile: centos7 gb instead of rhel7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=12ed07b8a069c2935a8079857d84d43edeb98f74;p=autobuild-ceph.git

fabfile: centos7 gb instead of rhel7

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

diff --git a/fabfile.py b/fabfile.py
index 9c8206c..fe31999 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -32,7 +32,7 @@ env.roledefs['gitbuilder_kernel_deb'] = [
 env.roledefs['gitbuilder_kernel_rpm'] = [
     'ubuntu@gitbuilder-kernel-rpm-centos6-amd64-basic.front.sepia.ceph.com',
     'ubuntu@gitbuilder-kernel-rpm-fedora20-amd64-basic.front.sepia.ceph.com',
-    'ubuntu@gitbuilder-kernel-rpm-rhel7-amd64-basic.front.sepia.ceph.com',
+    'ubuntu@gitbuilder-kernel-rpm-centos7-x86_64-basic.front.sepia.ceph.com',
     ]
 
 # special
@@ -861,6 +861,9 @@ def gitbuilder_serve():
 	    sudo('rm /tmp/lighttpd.conf')
 	    sudo('/etc/init.d/lighttpd start')
 
+@roles('gitbuilder_ceph_rpm',
+       'gitbuilder_kernel_rpm'
+       )
 def gitbuilder_serve_rpm():
     # kill any remaining thttpd's in favor of lighttpd.  Do this before
     # installing lighttpd so that lighttpd can start without errors