Merge "Make capability_scope configurable in devstack"
This commit is contained in:
commit
a0fa970669
@ -55,10 +55,10 @@ function configure_kuryr {
|
|||||||
|
|
||||||
create_kuryr_cache_dir
|
create_kuryr_cache_dir
|
||||||
|
|
||||||
# Neutron API server & Neutron plugin
|
|
||||||
if is_service_enabled kuryr-libnetwork; then
|
if is_service_enabled kuryr-libnetwork; then
|
||||||
configure_auth_token_middleware "$KURYR_CONFIG" kuryr \
|
configure_auth_token_middleware "$KURYR_CONFIG" kuryr \
|
||||||
"$KURYR_AUTH_CACHE_DIR" neutron
|
"$KURYR_AUTH_CACHE_DIR" neutron
|
||||||
|
iniset $KURYR_CONFIG DEFAULT capability_scope $KURYR_CAPABILITY_SCOPE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$ENABLE_PLUGINV2" == "True" ]]; then
|
if [[ "$ENABLE_PLUGINV2" == "True" ]]; then
|
||||||
|
@ -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=${KURYR_POOL_PREFIX:-10.10.0.0/16}
|
||||||
KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}
|
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}
|
KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375}
|
||||||
DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT}
|
DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user