airship/porthole
Code Issues Proposed changes

Cleanup old scripts

Browse Source 
The env-variables.sh get-values-overrides.sh
and wait-for-pods.sh are not needed any more
since they are now a part of openstack-helm-plugin.

https: //review.opendev.org/c/openstack/openstack-helm-infra/+/942852
Change-Id: I6e7f78a3f90ff82b06da0115d8c73fe30b853c23
This commit is contained in:
Sergiy Markin 2025-02-28 17:49:13 +00:00
parent 073810ca98
commit 99a07ff007
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/005-calicoctl-utility.sh
View File

@ -15,7 +15,7 @@ set -xe
namespace=utility
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
: ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(./tools/deployment/get-values-overrides.sh calicoctl-utility)"}
: ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(helm osh get-values-overrides calicoctl-utility)"}
helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --namespace=$namespace \
${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY}
@ -23,4 +23,4 @@ helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --nam
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

4
tools/deployment/010-ceph-utility.sh
View File

@ -54,7 +54,7 @@ helm upgrade --install ceph-utility-config ./ceph-provisioners \
--namespace=$namespace \
--values=/tmp/ceph-utility-config.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)} \
${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(helm osh get-values-overrides ceph-provisioners)} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
# Deploy Ceph-Utility
@ -69,4 +69,4 @@ helm upgrade --install ceph-utility ./artifacts/ceph-utility.tgz --namespace=$na
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

2
tools/deployment/020-compute-utility.sh
View File

@ -25,4 +25,4 @@ helm upgrade --install compute-utility ./artifacts/compute-utility.tgz --namespa
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

2
tools/deployment/030-etcdctl-utility.sh
View File

@ -24,4 +24,4 @@ helm upgrade --install etcdctl-utility ./artifacts/etcdctl-utility.tgz --namespa
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

6
tools/deployment/040-mysqlclient-utility.sh
View File

@ -32,7 +32,7 @@ manifests:
EOF
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(./tools/deployment/common/get-values-overrides.sh mariadb)"}
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides mariadb)"}
#NOTE: Lint and package chart
make -C "${HELM_CHART_ROOT_PATH}" mariadb
@ -47,7 +47,7 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
${OSH_EXTRA_HELM_ARGS_MARIADB}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
# Deploy mysqlclient-utility
cd "${CURRENT_DIR}"
@ -64,4 +64,4 @@ helm upgrade --install mysqlclient-utility ./artifacts/mysqlclient-utility.tgz -
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

2
tools/deployment/050-openstack-utility.sh
View File

@ -23,4 +23,4 @@ helm upgrade --install openstack-utility ./artifacts/openstack-utility.tgz --nam
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace

6
tools/deployment/060-postgresql-utility.sh
View File

@ -24,7 +24,7 @@ make postgresql
#NOTE: Deploy command
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(./tools/deployment/common/get-values-overrides.sh postgresql)"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides postgresql)"}
helm upgrade --install postgresql ./postgresql \
--namespace=osh-infra \
@ -36,7 +36,7 @@ helm upgrade --install postgresql ./postgresql \
${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra
helm osh wait-for-pods osh-infra
bash -c "./tools/deployment/common/ingress.sh"
# Deploy postgresql-utility
@ -55,4 +55,4 @@ helm upgrade --install postgresql-utility ./artifacts/postgresql-utility.tgz --n
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
helm osh wait-for-pods $namespace