openstack/kuryr-libnetwork
Code Issues Proposed changes

run_process with sudo in devstack will error

Browse Source 
This error happens after the following devstack patch merged:
https://review.openstack.org/#/c/462678/

Change-Id: I1e4f647b8491a8d3c2e43cba6da48e5d7450c2d1
Closes-Bug: #1688679
This commit is contained in:
Liping Mao (limao)
2017-05-06 09:22:45 +08:00
parent 0dd2ad15af
commit c07bae4a90
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@@ -157,7 +157,7 @@ if is_service_enabled kuryr-libnetwork; then
# After an ./unstack it will be stopped. So it is ok if it returns exit-code == 1 # After an ./unstack it will be stopped. So it is ok if it returns exit-code == 1
sudo service docker stop || true sudo service docker stop || true
run_process docker-engine "/usr/bin/sudo /usr/bin/docker daemon -H unix://$KURYR_DOCKER_ENGINE_SOCKET_FILE -H tcp://0.0.0.0:$KURYR_DOCKER_ENGINE_PORT --cluster-store etcd://localhost:$KURYR_ETCD_PORT" run_process docker-engine "/usr/bin/docker daemon -H unix://$KURYR_DOCKER_ENGINE_SOCKET_FILE -H tcp://0.0.0.0:$KURYR_DOCKER_ENGINE_PORT --cluster-store etcd://localhost:$KURYR_ETCD_PORT" "" "root"
# We put the stack user as owner of the socket so we do not need to # We put the stack user as owner of the socket so we do not need to
# run the Docker commands with sudo when developing. # run the Docker commands with sudo when developing.
@@ -201,7 +201,7 @@ if is_service_enabled kuryr-libnetwork; then
# Enable pluginv2 # Enable pluginv2
sudo docker plugin enable kuryr/libnetwork2:latest sudo docker plugin enable kuryr/libnetwork2:latest
else else
run_process kuryr-libnetwork "/usr/bin/sudo PYTHONPATH=$PYTHONPATH:$DEST/kuryr python $DEST/kuryr-libnetwork/scripts/run_server.py --config-file $KURYR_CONFIG" run_process kuryr-libnetwork "$DEST/kuryr-libnetwork/scripts/run_server.py --config-file $KURYR_CONFIG" "" "root"
fi fi
neutron subnetpool-create --default-prefixlen $KURYR_POOL_PREFIX_LEN --pool-prefix $KURYR_POOL_PREFIX kuryr neutron subnetpool-create --default-prefixlen $KURYR_POOL_PREFIX_LEN --pool-prefix $KURYR_POOL_PREFIX kuryr