From d025c02ce60e75c1a9fba3e63991de7a5da556e8 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Wed, 3 Jan 2024 09:23:56 -0600 Subject: [PATCH] Enable 2023.2 compute-kit-ovn job Depends-On: I9f852ff54cfc42536387fa51a73f019b56070345 Change-Id: I80e98df09693dcf5e4666e2bf3209ee34d11eedf --- tools/deployment/common/prepare-k8s.sh | 2 ++ tools/deployment/common/setup-gateway.sh | 15 +++++++++++ .../component/ovn/{125-ovn.sh => ovn.sh} | 16 +++++++++++ zuul.d/2023.2.yaml | 11 ++++++++ zuul.d/base.yaml | 27 +++++++++++++++++++ zuul.d/project.yaml | 1 + 6 files changed, 72 insertions(+) rename tools/deployment/component/ovn/{125-ovn.sh => ovn.sh} (82%) diff --git a/tools/deployment/common/prepare-k8s.sh b/tools/deployment/common/prepare-k8s.sh index a4d3724cf5..6cf7083f30 100755 --- a/tools/deployment/common/prepare-k8s.sh +++ b/tools/deployment/common/prepare-k8s.sh @@ -31,6 +31,8 @@ kubectl label --overwrite nodes --all ceph-mgr=enabled # and we don't need L2 overlay (will be implemented later). kubectl label --overwrite nodes -l "node-role.kubernetes.io/control-plane" l3-agent=enabled +kubectl label --overwrite nodes -l "node-role.kubernetes.io/control-plane" openstack-network-node=enabled + for NAMESPACE in ceph openstack osh-infra; do tee /tmp/${NAMESPACE}-ns.yaml << EOF apiVersion: v1 diff --git a/tools/deployment/common/setup-gateway.sh b/tools/deployment/common/setup-gateway.sh index 46a2a24d0e..de8d1d1724 100755 --- a/tools/deployment/common/setup-gateway.sh +++ b/tools/deployment/common/setup-gateway.sh @@ -13,6 +13,21 @@ # under the License. set -xe +# By default we set enable-chassis-as-gw on all OVN controllers which means +# all nodes are connected to the provider network, but for test environment this is not +# the case. +if [[ "$FEATURE_GATES" =~ (,|^)ovn(,|$) ]]; then +HOSTNAME=$(hostname -f) +kubectl -n openstack get po --selector application=ovn,component=ovn-controller -o name | while read po; do + kubectl -n openstack exec $po -c controller -- bash -c "if [[ \$(hostname -f) != ${HOSTNAME} ]]; then ovs-vsctl set open . external-ids:ovn-cms-options=availability-zones=nova; fi" +done +fi + +sleep 10 +export OS_CLOUD=openstack_helm +openstack network agent list +openstack availability zone list --network + # Assign IP address to br-ex : ${OSH_EXT_SUBNET:="172.24.4.0/24"} : ${OSH_BR_EX_ADDR:="172.24.4.1/24"} diff --git a/tools/deployment/component/ovn/125-ovn.sh b/tools/deployment/component/ovn/ovn.sh similarity index 82% rename from tools/deployment/component/ovn/125-ovn.sh rename to tools/deployment/component/ovn/ovn.sh index 35f117c5bb..f28ee0d2d7 100755 --- a/tools/deployment/component/ovn/125-ovn.sh +++ b/tools/deployment/component/ovn/ovn.sh @@ -22,10 +22,26 @@ export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../open #NOTE: Lint and package chart make -C ${HELM_CHART_ROOT_PATH} ovn +tee /tmp/ovn.yaml << EOF +volume: + ovn_ovsdb_nb: + enabled: false + ovn_ovsdb_sb: + enabled: false +network: + interface: + tunnel: null +conf: + ovn_bridge_mappings: public:br-ex + auto_bridge_add: + br-ex: null +EOF + #NOTE: Deploy command : ${OSH_EXTRA_HELM_ARGS:=""} helm upgrade --install ovn ${HELM_CHART_ROOT_PATH}/ovn \ --namespace=openstack \ + --values=/tmp/ovn.yaml \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_OVN} diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml index c8340eb92a..ecc8f3992e 100644 --- a/zuul.d/2023.2.yaml +++ b/zuul.d/2023.2.yaml @@ -52,6 +52,17 @@ container_distro_name: ubuntu container_distro_version: jammy +- job: + name: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy + parent: openstack-helm-compute-kit-ovn + nodeset: openstack-helm-3nodes-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.2" + container_distro_name: ubuntu + container_distro_version: jammy + feature_gates: ovn + - job: name: openstack-helm-umbrella-2023-2-ubuntu_jammy parent: openstack-helm-umbrella diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 78cc58bb2b..72254ec9ae 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -90,6 +90,33 @@ - ./tools/deployment/common/use-it.sh - ./tools/deployment/common/force-cronjob-run.sh +- job: + name: openstack-helm-compute-kit-ovn + parent: openstack-helm-deploy + abstract: true + vars: + gate_scripts: + - ./tools/deployment/common/prepare-k8s.sh + - ./tools/deployment/common/setup-client.sh + - ./tools/deployment/component/common/ingress.sh + - - ./tools/deployment/component/common/rabbitmq.sh + - ./tools/deployment/component/common/mariadb.sh + - ./tools/deployment/component/common/memcached.sh + - ./tools/deployment/component/keystone/keystone.sh + - - ./tools/deployment/component/heat/heat.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh + - ./tools/deployment/component/compute-kit/openvswitch.sh + - ./tools/deployment/component/compute-kit/libvirt.sh + - ./tools/deployment/component/ovn/ovn.sh + - ./tools/deployment/component/compute-kit/compute-kit.sh + - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron + - ./tools/deployment/common/run-helm-tests.sh nova + - ./tools/deployment/common/run-helm-tests.sh glance + - ./tools/deployment/common/run-helm-tests.sh keystone + - ./tools/deployment/common/setup-gateway.sh + - ./tools/deployment/common/use-it.sh + - ./tools/deployment/common/force-cronjob-run.sh + - job: name: openstack-helm-keystone-ldap parent: openstack-helm-deploy diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index f197f164d1..770e078ff6 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -43,6 +43,7 @@ - openstack-helm-compute-kit-2023-2-ubuntu_jammy # 3 nodes - openstack-helm-tls-2023-2-ubuntu_jammy # 1 node 32GB - openstack-helm-umbrella-2023-2-ubuntu_jammy # 1 node 32GB + - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy # 3 nodes gate: jobs: - openstack-helm-lint