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
diff --git a/lib/swift b/lib/swift
index 59c1e54..5d4d4ef 100644
--- a/lib/swift
+++ b/lib/swift
@@ -301,7 +301,7 @@
# 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 @@
# 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