Switch to "local" mode for kuryr libnetwork scope

Docker has removed external cluster store in latest version.
Therefore, we switch to "local" mode to work around.

Closes-Bug: #2007142
Change-Id: I31d140a75dae2ddd23551e648d0492327a8d8c8e

.zuul.yaml

@@ -59,12 +59,10 @@
     vars:
       devstack_localrc:
         KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
-        KURYR_CAPABILITY_SCOPE: global
         USE_PYTHON3: true
     group-vars:
       subnode:
         devstack_localrc:
-          KURYR_CAPABILITY_SCOPE: global
           KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
           KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
           USE_PYTHON3: true

devstack/local.conf.sample

@@ -17,9 +17,6 @@ ENABLE_CONTAINERD_CRI=True
 # Optional:  uncomment to enable Kata Container
 # ENABLE_KATA_CONTAINERS=True
 
-# In Kuryr, KURYR_CAPABILITY_SCOPE is `local` by default,
-# but we must change it to `global` in the multinode scenario.
-KURYR_CAPABILITY_SCOPE=global
 KURYR_PROCESS_EXTERNAL_CONNECTIVITY=False
 enable_plugin kuryr-libnetwork https://opendev.org/openstack/kuryr-libnetwork $TARGET_BRANCH
 

devstack/local.conf.subnode.sample

@@ -13,7 +13,6 @@ enable_plugin zun https://opendev.org/openstack/zun $TARGET_BRANCH
 # Optional:  uncomment to enable Kata Container
 # ENABLE_KATA_CONTAINERS=True
 
-KURYR_CAPABILITY_SCOPE=global
 KURYR_PROCESS_EXTERNAL_CONNECTIVITY=False
 enable_plugin kuryr-libnetwork https://opendev.org/openstack/kuryr-libnetwork $TARGET_BRANCH
 

devstack/settings

@@ -14,9 +14,6 @@
 # PHYSICAL_NETWORK=public
 # OVS_PHYSICAL_BRIDGE=br-ex
 
-# Configure Docker cluster store
-DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT}
-
 # Enable/Disable Kata Container
 ENABLE_KATA_CONTAINERS=${ENABLE_KATA_CONTAINERS:-false}
 
@@ -24,8 +21,6 @@ ENABLE_KATA_CONTAINERS=${ENABLE_KATA_CONTAINERS:-false}
 CNI_PLUGINS_INSTALL_PLUGINS=loopback,zun-cni
 CNI_PLUGINS_CONF_SOURCE_DIR=$DEST/zun/etc/cni/net.d
 
-UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-5:20.10.23~3-0~ubuntu-jammy}
-
 # Enable Zun services
 if [[ ${HOST_IP} == ${SERVICE_HOST} ]] || [[ "[${HOST_IPV6}]" == "${SERVICE_HOST}" ]]; then
     enable_service zun-api

doc/source/contributor/quickstart.rst

@@ -33,14 +33,6 @@ required OpenStack services::
         | sed "s/HOST_IP=.*/HOST_IP=$HOST_IP/" \
         > /opt/stack/devstack/local.conf
 
-.. note::
-
-    By default, *KURYR_CAPABILITY_SCOPE=global*. It will work in both
-    all-in-one and multi-node scenario. You still can change it to *local*
-    (in **all-in-one scenario only**)::
-
-    $ sed -i "s/KURYR_CAPABILITY_SCOPE=.*/KURYR_CAPABILITY_SCOPE=local/" /opt/stack/devstack/local.conf
-
 More devstack configuration information can be found at `Devstack Configuration
 <https://docs.openstack.org/devstack/latest/configuration.html>`_