Switch back to single node setup

This change reverts the multi-node setup to a
single node setup for the Porthole functional
tests. This is necessary to decrease the load on
the test environment and to simplify the
deployment process. In order to make it happen we
switch from rook-ceph to ceph chart from OSH,
which is more suitable for single node
deployments.

Change-Id: I085e6dd4f9d0a16d0abd183c0662de99b0e51823
Signed-off-by: Sergiy Markin <smarkin@mirantis.com>
This commit is contained in:
Sergiy Markin
2025-08-01 21:32:41 +00:00
parent 13adbc9f35
commit 362abbaded
2 changed files with 46 additions and 10 deletions

View File

@@ -23,17 +23,54 @@ CURRENT_DIR="$(pwd)"
cd "${OSH_PATH}" || exit
# NOTE: Lint and package ceph helm charts
make ceph-adapter-rook SKIP_CHANGELOG=1
for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
make "${CHART}" SKIP_CHANGELOG=1
done
./tools/deployment/ceph/ceph-rook.sh
./tools/deployment/ceph/ceph.sh
cd "${OSH_PATH}"
tee /tmp/ceph-utility-config.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: 172.17.0.1/16
cluster: 172.17.0.1/16
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
csi_rbd_provisioner: false
client_secrets: true
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
pod:
mandatory_access_control:
type: apparmor
ceph-utility-config-ceph-ns-key-generator :
ceph-storage-keys-generator: runtime/default
init: runtime/default
EOF
: ${OSH_EXTRA_HELM_ARGS:=""}
: ${OSH_VALUES_OVERRIDES_PATH:="../../openstack/openstack-helm/values_overrides"}
: ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY:="$(helm osh get-values-overrides -p ${OSH_VALUES_OVERRIDES_PATH} -c ceph-adapter-rook ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY:="$(helm osh get-values-overrides -p ${OSH_VALUES_OVERRIDES_PATH} -c ceph-provisioners ${FEATURES})"}
# NOTE: Deploy ceph-adapter-rook helm chart
helm upgrade --install ceph-utility-config ./ceph-adapter-rook \
# NOTE: Deploy ceph-provisioners helm chart
helm upgrade --install ceph-utility-config ./ceph-provisioners \
--namespace=${NAMESPACE} \
--values=/tmp/ceph-utility-config.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}

View File

@@ -106,7 +106,6 @@
- ^setup.cfg$
vars:
treasuremap_ref: v1.9
overlay_network_setup: true
args:
chdir: ../../airship/porthole
zuul_osh_relative_path: ../../openstack/openstack-helm
@@ -128,7 +127,7 @@
- job:
name: airship-porthole-run-functional-tests-ubuntu_jammy-kubeadm-2024-1
parent: porthole-infra-deploy
nodeset: treasuremap-airskiff-5nodes-ubuntu_jammy
nodeset: treasuremap-airskiff-1node-ubuntu_jammy
irrelevant-files: *irrelevant-files
run:
- tools/gate/playbooks/airship-run-scripts.yaml
@@ -142,7 +141,7 @@
- job:
name: airship-porthole-run-functional-tests-ubuntu_jammy-kubeadm-2023-2
parent: porthole-infra-deploy
nodeset: treasuremap-airskiff-5nodes-ubuntu_jammy
nodeset: treasuremap-airskiff-1node-ubuntu_jammy
irrelevant-files: *irrelevant-files
run:
- tools/gate/playbooks/airship-run-scripts.yaml
@@ -156,7 +155,7 @@
- job:
name: airship-porthole-openstack-tox-py310-kubeadm
parent: porthole-infra-deploy
nodeset: treasuremap-airskiff-5nodes-ubuntu_jammy
nodeset: treasuremap-airskiff-1node-ubuntu_jammy
irrelevant-files: *irrelevant-files
run:
- tools/gate/playbooks/airship-run-scripts.yaml
@@ -167,7 +166,7 @@
- job:
name: airship-porthole-openstack-tox-cover-kubeadm
parent: porthole-infra-deploy
nodeset: treasuremap-airskiff-5nodes-ubuntu_jammy
nodeset: treasuremap-airskiff-1node-ubuntu_jammy
irrelevant-files: *irrelevant-files
run:
- tools/gate/playbooks/airship-run-scripts.yaml