From 0e57b967e558fa843277d0119e50f0cb807929a2 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Fri, 28 Feb 2014 09:09:52 +0100 Subject: [PATCH] Devstack install can fail on missing xinetd.d/rsync config Assuming if the system does not have the xinetd.d/rsync, the dedicated service is the prefered way. Change-Id: Ic42651c5c3fb5bf0099786ca81a7bd06ace896a8 --- lib/swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/swift b/lib/swift index 59c1e54d8a..5d4d4ef506 100644 --- a/lib/swift +++ b/lib/swift @@ -301,7 +301,7 @@ function configure_swift { # rsyncd.conf just prepared for 4 nodes if is_ubuntu; then sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync - else + elif [ -e /etc/xinetd.d/rsync ]; then sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync fi @@ -635,8 +635,10 @@ function start_swift { # Start rsync if is_ubuntu; then sudo /etc/init.d/rsync restart || : + elif [ -e /etc/xinetd.d/rsync ]; then + start_service xinetd else - sudo systemctl start xinetd.service + start_service rsyncd fi if is_apache_enabled_service swift; then