Browse code

Merge "Devstack install can fail on missing xinetd.d/rsync config"

Jenkins authored on 2014/03/01 17:23:53
Showing 1 changed files
... ...
@@ -301,7 +301,7 @@ function configure_swift {
301 301
     # rsyncd.conf just prepared for 4 nodes
302 302
     if is_ubuntu; then
303 303
         sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync
304
-    else
304
+    elif [ -e /etc/xinetd.d/rsync ]; then
305 305
         sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync
306 306
     fi
307 307
 
... ...
@@ -635,8 +635,10 @@ function start_swift {
635 635
     # Start rsync
636 636
     if is_ubuntu; then
637 637
         sudo /etc/init.d/rsync restart || :
638
+    elif [ -e /etc/xinetd.d/rsync ]; then
639
+        start_service xinetd
638 640
     else
639
-        sudo systemctl start xinetd.service
641
+        start_service rsyncd
640 642
     fi
641 643
 
642 644
     if is_apache_enabled_service swift; then