diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 5d9c3773..26aa90ba 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 diff --git a/devstack/settings b/devstack/settings index 0f1876cb..cd07a978 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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}