From bbf2cae2591975197541ff25cb6d462cadbe1338 Mon Sep 17 00:00:00 2001 From: Arina Stebenkova Date: Fri, 18 Jul 2025 18:01:03 +0300 Subject: [PATCH] Switch to ceph rook deployment This change updates the deployment scripts to use Ceph Rook instead of the previous Ceph deployment method. Change-Id: I9a913aee3191470d32bec3ae3ec9367da1c01f40 Signed-off-by: Arina Stebenkova --- README.md | 1 + tools/deployment/003-prepare-k8s.sh | 4 +- tools/deployment/010-ceph-utility.sh | 56 +--- ...l-tests.yaml => run-functional-tests.yaml} | 3 +- tools/gate/playbooks/run-tox-tests.yaml | 47 +++ tools/helm_install.sh | 2 +- zuul.d/base.yaml | 277 ++++-------------- zuul.d/nodesets.yaml | 64 ++++ 8 files changed, 185 insertions(+), 269 deletions(-) rename tools/gate/playbooks/{make-functional-tests.yaml => run-functional-tests.yaml} (94%) create mode 100644 tools/gate/playbooks/run-tox-tests.yaml create mode 100644 zuul.d/nodesets.yaml diff --git a/README.md b/README.md index ec953ff1..826132bb 100644 --- a/README.md +++ b/README.md @@ -66,3 +66,4 @@ The recommended minimum system requirements for a full deployment are: The PostgreSQL utility container needed Postgresql DB Pods for Testing. Please follow below Link. `[PostgreSQL README](https://opendev.org/airship/porthole/src/branch/master/images/postgresql-utility/README.md).` + diff --git a/tools/deployment/003-prepare-k8s.sh b/tools/deployment/003-prepare-k8s.sh index c288f559..b9844002 100755 --- a/tools/deployment/003-prepare-k8s.sh +++ b/tools/deployment/003-prepare-k8s.sh @@ -31,7 +31,9 @@ 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 -for NAMESPACE in ceph mariadb-operator utility ucp openstack osh-infra; do +kubectl label --overwrite nodes -l "node-role.kubernetes.io/control-plane" openstack-network-node=enabled + +for NAMESPACE in mariadb-operator utility ucp ceph openstack osh-infra; do tee /tmp/${NAMESPACE}-ns.yaml << EOF apiVersion: v1 kind: Namespace diff --git a/tools/deployment/010-ceph-utility.sh b/tools/deployment/010-ceph-utility.sh index 4baccada..786569ef 100755 --- a/tools/deployment/010-ceph-utility.sh +++ b/tools/deployment/010-ceph-utility.sh @@ -17,63 +17,25 @@ set -xe CURRENT_DIR="$(pwd)" # NOTE: Define variables -: ${OSH_PATH:="../openstack-helm"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +: ${OSH_PATH:="../../openstack/openstack-helm"} : ${NAMESPACE:=utility} -cd "${OSH_INFRA_PATH}" || exit +cd "${OSH_PATH}" || exit # NOTE: Lint and package ceph helm charts -for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do - make "${CHART}" SKIP_CHANGELOG=1 -done +make ceph-adapter-rook SKIP_CHANGELOG=1 -./tools/deployment/ceph/ceph.sh - -cd "${OSH_INFRA_PATH}" - -tee /tmp/ceph-utility-config.yaml <