openstack/devstack
Code Issues Proposed changes

Merge "functions-common: Use systemctl when applicable"

Browse Source
This commit is contained in:
Jenkins
2016-05-25 04:12:33 +00:00
committed by Gerrit Code Review
parent f5998b0253 247e44625c
commit aacd30a6ca
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
functions-common
View File

@@ -2264,11 +2264,12 @@ function python_version {
# Service wrapper to restart services # Service wrapper to restart services
# restart_service service-name # restart_service service-name
function restart_service { function restart_service {
if is_ubuntu; then if [ -x /bin/systemctl ]; then
sudo /usr/sbin/service $1 restart sudo /bin/systemctl restart $1
else else
sudo /sbin/service $1 restart sudo service $1 restart
fi fi
} }
# Only change permissions of a file or directory if it is not on an # Only change permissions of a file or directory if it is not on an
@@ -2286,20 +2287,20 @@ function safe_chown {
# Service wrapper to start services # Service wrapper to start services
# start_service service-name # start_service service-name
function start_service { function start_service {
if is_ubuntu; then if [ -x /bin/systemctl ]; then
sudo /usr/sbin/service $1 start sudo /bin/systemctl start $1
else else
sudo /sbin/service $1 start sudo service $1 start
fi fi
} }
# Service wrapper to stop services # Service wrapper to stop services
# stop_service service-name # stop_service service-name
function stop_service { function stop_service {
if is_ubuntu; then if [ -x /bin/systemctl ]; then
sudo /usr/sbin/service $1 stop sudo /bin/systemctl stop $1
else else
sudo /sbin/service $1 stop sudo service $1 stop
fi fi
} }