openstack
/
kuryr-libnetwork
Code Issues Proposed changes

Merge "Make capability_scope configurable in devstack"

This commit is contained in:
Jenkins 2017-10-04 08:10:44 +00:00 committed by Gerrit Code Review
parent f34d0a017f c5684a803e
commit a0fa970669
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -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

2
devstack/settings
View File

@ -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}