diff --git a/.zuul.yaml b/.zuul.yaml index b134930f..f6ec1efb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -59,7 +59,6 @@ vars: devstack_localrc: KURYR_CONFIG_DIR: /etc/kuryr-libnetwork - KURYR_CAPABILITY_SCOPE: global devstack_plugins: devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container kuryr-libnetwork: https://opendev.org/openstack/kuryr-libnetwork diff --git a/devstack/settings b/devstack/settings index df3c8186..24f8660c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,19 +19,13 @@ 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_CAPABILITY_SCOPE=local KURYR_PROCESS_EXTERNAL_CONNECTIVITY=${KURYR_PROCESS_EXTERNAL_CONNECTIVITY:-True} KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375} -DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT} -UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-5:20.10.23~3-0~ubuntu-jammy} GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git} GITBRANCH["kuryr"]=${KURYR_BRANCH:-$TARGET_BRANCH} GITDIR["kuryr"]=$DEST/kuryr enable_service kuryr-libnetwork docker-engine - -if [[ ${HOST_IP} == ${SERVICE_HOST} ]] || [[ "[${HOST_IPV6}]" == "${SERVICE_HOST}" ]]; then - enable_service etcd3 -fi