openstack
/
kuryr-libnetwork
Code Issues Proposed changes

Fix the command to start kuryr server 

In before, devstack doesn't use a setuptool-generated script to run
kuryr server. The static script it uses doesn't work in python3
devstack because it still point to the python2 executable. This
commit fixed this issue.

Change-Id: Ib222bf2e84f4b06b0dc3981fc3554510658d4ef0
This commit is contained in:
Hongbin Lu 2017-08-03 17:17:08 -04:00
parent ee47bcb7ea
commit c0ce79bad9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -143,7 +143,7 @@ if is_service_enabled kuryr-libnetwork; then
# Enable pluginv2
sudo docker plugin enable kuryr/libnetwork2:latest
else
run_process kuryr-libnetwork "$DEST/kuryr-libnetwork/scripts/run_server.py --config-file $KURYR_CONFIG" "" "root"
run_process kuryr-libnetwork "$KURYR_BIN_DIR/kuryr-server --config-file $KURYR_CONFIG" "" "root"
fi
neutron subnetpool-create --default-prefixlen $KURYR_POOL_PREFIX_LEN --pool-prefix $KURYR_POOL_PREFIX kuryr

1
devstack/settings
View File

@ -14,6 +14,7 @@ KURYR_CONFIG_DIR=${KURYR_CONFIG_DIR:-/etc/kuryr}
KURYR_CONFIG=${KURYR_CONFIG_DIR}/${KURYR_CONFIG_FILENAME}
KURYR_AUTH_CACHE_DIR=${KURYR_AUTH_CACHE_DIR:-/var/cache/kuryr}
KURYR_LOG_DIR=${KURYR_LOG_DIR:-/var/log/kuryr}
KURYR_BIN_DIR=$(get_python_exec_prefix)
KURYR_POOL_PREFIX=${KURYR_POOL_PREFIX:-10.10.0.0/16}
KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}