openstack/openstack-helm
Code Issues Proposed changes

Merge "Cleanup FEATURE_GATES variable"

Browse Source
This commit is contained in:
Zuul 2025-02-27 22:57:16 +00:00 committed by Gerrit Code Review
commit 090878eba4
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/common/ingress.sh
View File

@ -18,7 +18,7 @@ set -xe
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
if ! [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
if ! [[ ${FEATURES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
#NOTE: Deploy cluster ingress
helm upgrade --install ingress-nginx-cluster ingress-nginx/ingress-nginx \
--version ${HELM_INGRESS_NGINX_VERSION} \

2
tools/deployment/common/setup-client.sh
View File

@ -16,7 +16,7 @@ set -xe
sudo -H mkdir -p /etc/openstack
sudo -H chown -R $(id -un): /etc/openstack
FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
tee /etc/openstack/clouds.yaml << EOF
clouds:
openstack_helm:

2
tools/deployment/common/setup-gateway.sh
View File

@ -16,7 +16,7 @@ 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
if [[ "$FEATURES" =~ (,|^)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"

2
tools/deployment/common/use-it.sh
View File

@ -14,7 +14,7 @@
set -xe
DPDK_ENABLED=disabled
if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])dpdk($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])dpdk($|[[:space:]]) ]]; then
DPDK_ENABLED=enabled
fi

2
tools/deployment/component/heat/heat.sh
View File

@ -35,6 +35,6 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
openstack orchestration service list
FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://heat.openstack.svc.cluster.local
fi

2
tools/deployment/component/horizon/horizon.sh
View File

@ -33,6 +33,6 @@ if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
./tools/deployment/common/run-helm-tests.sh horizon
fi
FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://horizon.openstack.svc.cluster.local
fi

4
tools/deployment/component/keystone/keystone.sh
View File

@ -34,7 +34,7 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
openstack endpoint list
#NOTE: Validate feature gate options if required
FEATURE_GATE="ldap"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])ldap($|[[:space:]]) ]]; then
#NOTE: Do some additional queries here for LDAP
openstack domain list
openstack user list
@ -63,6 +63,6 @@ if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
./tools/deployment/common/run-helm-tests.sh keystone
fi
FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://keystone.openstack.svc.cluster.local
fi