diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f7d79318..578edf6a 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -55,10 +55,10 @@ function configure_kuryr { create_kuryr_cache_dir - # Neutron API server & Neutron plugin if is_service_enabled kuryr-libnetwork; then configure_auth_token_middleware "$KURYR_CONFIG" kuryr \ "$KURYR_AUTH_CACHE_DIR" neutron + iniset $KURYR_CONFIG DEFAULT capability_scope $KURYR_CAPABILITY_SCOPE fi if [[ "$ENABLE_PLUGINV2" == "True" ]]; then diff --git a/devstack/settings b/devstack/settings index 8b5f54c0..6166df8a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,6 +19,8 @@ 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} +KURYR_CAPABILITY_SCOPE=${KURYR_CAPABILITY_SCOPE:-local} + KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375} DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT}