openstack/devstack
Code Issues Proposed changes

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

Browse Source 
Assuming if the system does not have the xinetd.d/rsync,
the dedicated service is the prefered way.

Change-Id: Ic42651c5c3fb5bf0099786ca81a7bd06ace896a8
This commit is contained in:
Attila Fazekas 2014-02-28 09:09:52 +01:00
parent 2cf03d2469
commit 0e57b967e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/swift
View File

@ -301,7 +301,7 @@ function configure_swift {
# rsyncd.conf just prepared for 4 nodes # rsyncd.conf just prepared for 4 nodes
if is_ubuntu; then if is_ubuntu; then
sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync 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 sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync
fi fi
@ -635,8 +635,10 @@ function start_swift {
# Start rsync # Start rsync
if is_ubuntu; then if is_ubuntu; then
sudo /etc/init.d/rsync restart || : sudo /etc/init.d/rsync restart || :
elif [ -e /etc/xinetd.d/rsync ]; then
start_service xinetd
else else
sudo systemctl start xinetd.service start_service rsyncd
fi fi
if is_apache_enabled_service swift; then if is_apache_enabled_service swift; then