openstack
/
fuxi
Code Issues Proposed changes

Use absoluted path for command 

It looks the command inside "run_process" needs to have an absoluted
path due to the switching from screen to systemd.

Change-Id: I7ba6660408249cd82e3b82743ec96f1bbc4765eb
This commit is contained in:
Hongbin Lu 2017-05-02 23:13:41 -04:00
parent 3dbcbf0a76
commit 2cba409c63
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -16,6 +16,7 @@ XTRACE=$(set +o | grep xtrace)
set +o xtrace
ETCD_VERSION=v2.2.2
FUXI_BIN_DIR=$(get_python_exec_prefix)
function install_etcd_data_store {
@ -132,7 +133,7 @@ if is_service_enabled fuxi; then
# After an ./unstack it will be stopped. So it is ok if it returns exit-code == 1
sudo service docker stop || true
run_process docker-engine "sudo /usr/bin/docker daemon -H unix://$FUXI_DOCKER_ENGINE_SOCKET_FILE -H tcp://0.0.0.0:$FUXI_DOCKER_ENGINE_PORT --cluster-store etcd://localhost:$FUXI_ETCD_PORT"
run_process docker-engine "/usr/bin/docker daemon -H unix://$FUXI_DOCKER_ENGINE_SOCKET_FILE -H tcp://0.0.0.0:$FUXI_DOCKER_ENGINE_PORT --cluster-store etcd://localhost:$FUXI_ETCD_PORT" "" "root"
# We put the stack user as owner of the socket so we do not need to
# run the Docker commands with sudo when developing.
@ -153,7 +154,7 @@ if is_service_enabled fuxi; then
fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
run_process fuxi "sudo fuxi-server --config-file $FUXI_CONFIG"
run_process fuxi "$FUXI_BIN_DIR/fuxi-server --config-file $FUXI_CONFIG" "" "root"
fi