From: Sage Weil <sage@redhat.com>
Date: Sat, 20 Jun 2015 22:20:38 +0000 (-0700)
Subject: systemctl start+enable
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=358beffaa9411a7a5ab74cd5649fea89235c04f3;p=autobuild-ceph.git

systemctl start+enable
---

diff --git a/fabfile.py b/fabfile.py
index f1c5d82..b940297 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -258,7 +258,7 @@ def _gitbuilder(flavor, git_repo, extra_remotes={}, extra_packages=[], ignore=[]
     gitbuilder_origin='git://github.com/ceph/gitbuilder.git'
 
     # shut down old instance, it exists
-    sudo("initctl list|grep -q '^autobuild-ceph\s' && stop autobuild-ceph || /etc/init.d/autobuild-ceph stop || systemctl stop autobuild-ceph || :")
+    sudo("initctl list|grep -q '^autobuild-ceph\s' && stop autobuild-ceph || /etc/init.d/autobuild-ceph stop ; systemctl stop autobuild-ceph || :")
 
     # sun-java6 is in partner repo.  accept license.
     #sudo("echo 'deb http://archive.canonical.com/ubuntu maverick partner' > /etc/apt/sources.list.d/partner.list")
@@ -447,7 +447,7 @@ def gitbuilder_kernel_deb():
             ],
         )
     _sync_to_gitbuilder_from_hostname()
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 
 
@@ -469,7 +469,7 @@ def gitbuilder_kernel_rpm():
             ],
         )
     _sync_to_gitbuilder('kernel','rpm','basic')
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 
 def _hadoop_deps():
@@ -522,7 +522,7 @@ def gitbuilder_samba():
         branches_local_name='branches-local-samba',
         )
     _deb_install_extras()
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
     _sync_to_gitbuilder('samba', 'deb', 'basic')
 
 @roles('gitbuilder_hadoop')
@@ -538,7 +538,7 @@ def gitbuilder_hadoop():
         branches_local_name='branches-local-hadoop',
         )
     _sync_to_gitbuilder('hadoop', 'jar', 'basic')
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 @roles('gitbuilder_apache_hadoop')
 def gitbuilder_apache_hadoop():
@@ -553,7 +553,7 @@ def gitbuilder_apache_hadoop():
         branches_local_name='branches-local-apache-hadoop',
         )
     _sync_to_gitbuilder('apache-hadoop', 'jar', 'basic')
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 @roles('gitbuilder_ceph')
 def gitbuilder_ceph():
@@ -610,7 +610,7 @@ def _gitbuilder_ceph(flavor):
             'libsnappy-dev',
             ],
         )
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 def _deb_builder(git_url, flavor, extra_remotes={}):
     _gitbuilder(
@@ -677,7 +677,7 @@ def gitbuilder_auto():
                  extra_remotes=dict(
                      ci='https://github.com/ceph/ceph-ci.git'
                  ))
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
     _sync_to_gitbuilder_from_hostname()
 
 @roles('gitbuilder_ceph_rpm')
@@ -765,7 +765,7 @@ def _gitbuilder_ceph_rpm(url, flavor, extra_remotes={}):
         )
     with cd('/srv/autobuild-ceph'):
         sudo('echo centos6 > dists')
-    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start || systemctl enable autobuild-ceph || systemctl start autobuild-ceph')
+    sudo('start autobuild-ceph || /etc/init.d/autobuild-ceph start ; systemctl enable autobuild-ceph ; systemctl start autobuild-ceph')
 
 @roles('gitbuilder_doc')
 def gitbuilder_doc():