Updated local.conf for kuryr

kuryr.conf

@@ -1,9 +1,11 @@
 [[local|localrc]]
 
+# USE_PYTHON3=True
+# KURYR_IPV6=True
 Q_PLUGIN_CONF_FILE=/etc/neutron/plugins/ml2/ml2_conf.ini
 
 enable_plugin kuryr-kubernetes \
-    https://git.openstack.org/openstack/kuryr-kubernetes
+    https://opendev.org/openstack/kuryr-kubernetes
 
 # If you do not want stacking to clone new versions of the enabled services,
 # like for example when you did local modifications and need to ./unstack.sh
@@ -38,8 +40,9 @@ enable_service neutron-dhcp
 enable_service neutron-l3
 enable_service neutron-api
 
+# Octavia LBaaSv2
 LIBS_FROM_GIT+=python-octaviaclient
-enable_plugin octavia https://git.openstack.org/openstack/octavia
+enable_plugin octavia https://opendev.org/openstack/octavia
 enable_service octavia
 enable_service o-api
 enable_service o-cw
@@ -48,7 +51,7 @@ enable_service o-hk
 ## Octavia Deps
 ### Image
 ### Barbican
-enable_plugin barbican https://git.openstack.org/openstack/barbican
+enable_plugin barbican https://opendev.org/openstack/barbican
 ### Nova
 enable_service n-api
 enable_service n-api-meta
@@ -75,20 +78,7 @@ enable_service etcd3
 # ======
 # If you already have docker configured, running and with its socket writable
 # by the stack user, you can omit the following line.
-enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container
+enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
-
-# Kubernetes
-# ==========
-#
-# Kubernetes is run from the hyperkube docker image
-# If you already have a Kubernetes deployment, you can use it instead and omit
-# enabling the Kubernetes service (except Kubelet, which must be run by
-# devstack so that it uses our development CNI driver.
-#
-# The default is, again, for devstack to run the Kubernetes services:
-enable_service kubernetes-api
-enable_service kubernetes-controller-manager
-enable_service kubernetes-scheduler
 
 # We use hyperkube to run the services. You can select the hyperkube image and/
 # or version by uncommenting and setting the following ENV vars different
@@ -114,12 +104,6 @@ enable_service kubernetes-scheduler
 # KURYR_K8S_API_KEY="/etc/kubernetes/certs/kubecfg.key"
 # KURYR_K8S_API_CACERT="/etc/kubernetes/certs/ca.crt"
 
-# Kubelet
-# =======
-#
-# Kubelet should almost invariably be run by devstack
-enable_service kubelet
-
 # You can specify a different location for the hyperkube binary that will be
 # extracted from the hyperkube container into the Host filesystem:
 # KURYR_HYPERKUBE_BINARY=/usr/local/bin/hyperkube
@@ -127,12 +111,6 @@ enable_service kubelet
 # NOTE: KURYR_HYPERKUBE_IMAGE, KURYR_HYPERKUBE_VERSION also affect which
 # the selected binary for the Kubelet.
 
-# Kuryr watcher
-# =============
-#
-# Just like the Kubelet, you'll want to have the watcher enabled. It is the
-# part of the codebase that connects to the Kubernetes API server to read the
-# resource events and convert them to Neutron actions
 enable_service kuryr-kubernetes
 
 
@@ -157,14 +135,37 @@ KURYR_K8S_CONTAINERIZED_DEPLOYMENT=False
 
 IMAGE_URLS+=",http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
 
+# Kubernetes
+# ==========
+#
+# Kubernetes is run from the hyperkube docker image
+# If you already have a Kubernetes deployment, you can use it instead and omit
+# enabling the Kubernetes service (except Kubelet, which must be run by
+# devstack so that it uses our development CNI driver.
+#
+# The default is, again, for devstack to run the Kubernetes services:
+enable_service kubernetes-api
+enable_service kubernetes-controller-manager
+enable_service kubernetes-scheduler
+
+# Kubelet
+# =======
+#
+# Kubelet should almost invariably be run by devstack
+enable_service kubelet
+
 # OpenShift
 #enable_service openshift-master openshift-node
+#enable_service coredns
+#enable_service openshift-dnsmasq openshift-dns
 #DOCKER_CGROUP_DRIVER="systemd"
-#OPENSHIFT_BINARY_URL=https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-server-v3.9.0-191fece-linux-64bit.tar.gz
+#KURYR_ENABLED_HANDLERS="vif,lb,lbaasspec,namespace,pod_label,policy,kuryrnetpolicy"
+#KURYR_SG_DRIVER="policy"
+#KURYR_SUBNET_DRIVER="namespace"
 
 # Tempest
 enable_service tempest
-enable_plugin kuryr-tempest-plugin https://git.openstack.org/openstack/kuryr-tempest-plugin
+enable_plugin kuryr-tempest-plugin https://opendev.org/openstack/kuryr-tempest-plugin
 
 # KURYR_USE_PORTS_POOLS=True
 # KURYR_VIF_POOL_DRIVER=daemon
@@ -176,3 +177,21 @@ enable_plugin kuryr-tempest-plugin https://git.openstack.org/openstack/kuryr-tem
 # Pools
 #KURYR_USE_PORT_POOLS=true
 #KURYR_VIF_POOL_DRIVER=neutron
+
+# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
+# OCTAVIA_AMP_IMAGE_SIZE=3
+# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-bionic
+
+# OCTAVIA_MGMT_SUBNET=${OCTAVIA_MGMT_SUBNET:-"192.168.1.0/24"}
+# OCTAVIA_MGMT_SUBNET_START=${OCTAVIA_MGMT_SUBNET_START:-"192.168.1.2"}
+# OCTAVIA_MGMT_SUBNET_END=${OCTAVIA_MGMT_SUBNET_END:-"192.168.1.200"}
+
+# OVN
+# enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
+# enable_service ovn-northd ovn-controller networking-ovn-metadata-agent q-trunk q-svc neutron
+# VAR_RUN_PATH=/usr/local/var/run
+#Q_USE_PROVIDERNET_FOR_PUBLIC=true
+#PHYSICAL_NETWORK=public
+#OVN_L3_CREATE_PUBLIC_NETWORK=true
+#Q_BUILD_OVS_FROM_GIT=false
+#KURYR_NEUTRON_DEFAULT_ROUTER=kuryr-router