openstack/openstack-helm
Code Issues Proposed changes

Merge "Utilize OSH plugin for deployment test scripts"

Browse Source
This commit is contained in:
Zuul 2024-04-22 18:08:19 +00:00 committed by Gerrit Code Review
commit 3b189c5433
31 changed files with 110 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/install/before_deployment.rst
View File

@ -20,6 +20,14 @@ deployment process.
All further steps assume these two repositories are cloned into the
`~/osh` directory.
Next, you need to update the dependencies for all the charts in both OpenStack-Helm
repositories. This can be done by running the following commands:
.. code-block:: bash
cd ~/osh/openstack-helm
./tools/deployment/common/prepare-charts.sh
Also before deploying the OpenStack cluster you have to specify the
OpenStack and the operating system version that you would like to use
for deployment. For doing this export the following environment variables

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

@ -35,7 +35,7 @@ if ! [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
--set controller.labels.app=ingress-api
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh kube-system
helm osh wait-for-pods kube-system
fi
#NOTE: Deploy namespace ingress
@ -52,7 +52,7 @@ helm upgrade --install ingress-nginx-openstack ingress-nginx/ingress-nginx \
--set controller.labels.app=ingress-api
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
helm upgrade --install ingress-nginx-ceph ingress-nginx/ingress-nginx \
--version ${HELM_INGRESS_NGINX_VERSION} \
@ -67,4 +67,4 @@ helm upgrade --install ingress-nginx-ceph ingress-nginx/ingress-nginx \
--set controller.labels.app=ingress-api
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph
helm osh wait-for-pods ceph

24
tools/deployment/common/prepare-charts.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/bash
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
# Build all OSH Infra charts (necessary for Openstack deployment)
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
(
cd ${OSH_INFRA_PATH} &&
make all
)
# Build all OSH charts
make all

5
tools/deployment/component/aodh/aodh.sh
View File

@ -13,9 +13,6 @@
# under the License.
set -xe
#NOTE: Lint and package chart
make aodh
#NOTE: Wait for deploy
helm upgrade --install aodh ./aodh \
--namespace=openstack \
@ -27,7 +24,7 @@ helm upgrade --install aodh ./aodh \
${OSH_EXTRA_HELM_ARGS_AODH}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/barbican/barbican.sh
View File

@ -15,12 +15,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(./tools/deployment/common/get-values-overrides.sh barbican)"}
: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides -c barbican ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make barbican
#NOTE: Deploy command
helm upgrade --install barbican ./barbican \
--namespace=openstack \
@ -28,7 +25,7 @@ helm upgrade --install barbican ./barbican \
${OSH_EXTRA_HELM_ARGS_BARBICAN}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
# Run helm test
if [ "x${RUN_HELM_TESTS}" != "xno" ]; then

5
tools/deployment/component/ceilometer/ceilometer.sh
View File

@ -13,9 +13,6 @@
# under the License.
set -xe
#NOTE: Lint and package chart
make ceilometer
#NOTE: Wait for deploy
helm upgrade --install ceilometer ./ceilometer \
--namespace=openstack \
@ -27,7 +24,7 @@ helm upgrade --install ceilometer ./ceilometer \
${OSH_EXTRA_HELM_ARGS_CEILOMETER}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/ceph/ceph-ns-activate.sh
View File

@ -16,10 +16,7 @@ set -xe
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} ceph-provisioners
: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c ceph-provisioners ${FEATURES})"}
#NOTE: Deploy command
tee /tmp/ceph-openstack-config.yaml <<EOF
@ -50,7 +47,7 @@ helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provis
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
kubectl get -n openstack jobs

7
tools/deployment/component/cinder/cinder.sh
View File

@ -14,12 +14,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides -c cinder ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make cinder
#NOTE: Deploy command
tee /tmp/cinder.yaml <<EOF
conf:
@ -66,7 +63,7 @@ helm upgrade --install cinder ./cinder \
${OSH_EXTRA_HELM_ARGS_CINDER}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/common/mariadb.sh
View File

@ -16,10 +16,7 @@ set -xe
#NOTE: Get the over-rides to use
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)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} mariadb
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c mariadb ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -32,4 +29,4 @@ 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

7
tools/deployment/component/common/memcached.sh
View File

@ -16,10 +16,7 @@ set -xe
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(./tools/deployment/common/get-values-overrides.sh memcached)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} memcached
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c memcached ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -29,4 +26,4 @@ helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
${OSH_EXTRA_HELM_ARGS_MEMCACHED}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

29
tools/deployment/component/common/openstack.sh
View File

@ -68,21 +68,18 @@ neutron:
EOF
## includes second argument 'subchart' to indicate a different path
export HELM_CHART_ROOT_PATH="../openstack-helm/openstack"
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(./tools/deployment/common/get-values-overrides.sh mariadb subchart)"}
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq subchart)"}
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(./tools/deployment/common/get-values-overrides.sh memcached subchart)"}
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone subchart)"}
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(./tools/deployment/common/get-values-overrides.sh heat subchart)"}
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance subchart)"}
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(./tools/deployment/common/get-values-overrides.sh openvswitch subchart)"}
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt subchart)"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova subchart)"}
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement subchart)"}
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron subchart)"}
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(./tools/deployment/common/get-values-overrides.sh horizon subchart)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} .
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides -c openstack -s mariadb ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides -c openstack -s rabbitmq ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides -c openstack -s memcached ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides -c openstack -s keystone ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides -c openstack -s heat ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides -c openstack -s glance ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides -c openstack -s openvswitch ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides -c openstack -s libvirt ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides -c openstack -s nova ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides -c openstack -s placement ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides -c openstack -s neutron ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides -c openstack -s horizon ${FEATURES})"}
if [ "x$(systemd-detect-virt)" != "xnone" ]; then
echo 'OSH is being deployed in virtualized environment, using qemu for nova'
@ -129,7 +126,7 @@ if [[ "$FEATURE_GATES" =~ (,|^)tf(,|$) ]]; then
fi
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh $namespace 1800
helm osh wait-for-pods $namespace 1800
# list pods and services
echo "------------------ List kube-system pods and servics ------------"

7
tools/deployment/component/common/rabbitmq.sh
View File

@ -16,10 +16,7 @@ set -xe
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} rabbitmq
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c rabbitmq ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
@ -31,4 +28,4 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
${OSH_EXTRA_HELM_ARGS_RABBITMQ}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

2
tools/deployment/component/compute-kit/compute-kit-sr-iov.sh
View File

@ -125,7 +125,7 @@ helm upgrade --install neutron ./neutron \
${OSH_EXTRA_HELM_ARGS}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

17
tools/deployment/component/compute-kit/compute-kit.sh
View File

@ -23,20 +23,14 @@ if openstack service list -f value -c Type | grep -q "^volume" && \
fi
# Get overrides
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement)"}
# Lint and package
make placement
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides -c placement ${FEATURES})"}
# Deploy placement
helm upgrade --install placement ./placement --namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} ${OSH_EXTRA_HELM_ARGS_PLACEMENT}
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
#NOTE: Lint and package chart
make nova
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides -c nova ${FEATURES})"}
#NOTE: Deploy nova
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -61,10 +55,7 @@ else
fi
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
#NOTE: Lint and package chart
make neutron
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides -c neutron ${FEATURES})"}
#NOTE: Deploy neutron
tee /tmp/neutron.yaml << EOF
@ -114,7 +105,7 @@ if [[ "$FEATURE_GATES" =~ (,|^)tf(,|$) ]]; then
exit 0
fi
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

8
tools/deployment/component/compute-kit/libvirt.sh
View File

@ -22,10 +22,7 @@ fi
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} libvirt
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c libvirt ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -34,3 +31,6 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
--set conf.ceph.enabled=${CEPH_ENABLED} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_LIBVIRT}
#NOTE: DO NOT wait for pods are ready, because libvirt depends
# on neutron ovs agent pods or ovn controller pods

7
tools/deployment/component/compute-kit/openvswitch.sh
View File

@ -15,10 +15,7 @@ set -xe
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(./tools/deployment/common/get-values-overrides.sh openvswitch)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} openvswitch
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
@ -27,4 +24,4 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

7
tools/deployment/component/glance/glance.sh
View File

@ -15,12 +15,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"}
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides -c glance ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make glance
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
: ${GLANCE_BACKEND:="pvc"}
@ -43,7 +40,7 @@ helm upgrade --install glance ./glance \
${OSH_EXTRA_HELM_ARGS_GLANCE}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
export OS_CLOUD=openstack_helm
openstack service list

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

@ -14,10 +14,7 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(./tools/deployment/common/get-values-overrides.sh heat)"}
#NOTE: Lint and package chart
make heat
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides -c heat ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -27,7 +24,7 @@ helm upgrade --install heat ./heat \
${OSH_EXTRA_HELM_ARGS_HEAT}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

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

@ -15,12 +15,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(./tools/deployment/common/get-values-overrides.sh horizon)"}
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides -c horizon ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make horizon
#NOTE: Deploy command
helm upgrade --install horizon ./horizon \
--namespace=openstack \
@ -28,7 +25,7 @@ helm upgrade --install horizon ./horizon \
${OSH_EXTRA_HELM_ARGS_HORIZON}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
./tools/deployment/common/run-helm-tests.sh horizon

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

@ -15,12 +15,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides -c keystone ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make keystone
#NOTE: Deploy command
helm upgrade --install keystone ./keystone \
--namespace=openstack \
@ -28,7 +25,7 @@ helm upgrade --install keystone ./keystone \
${OSH_EXTRA_HELM_ARGS_KEYSTONE:=}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
export OS_CLOUD=openstack_helm
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

5
tools/deployment/component/magnum/magnum.sh
View File

@ -13,9 +13,6 @@
# under the License.
set -xe
#NOTE: Lint and package chart
make magnum
#NOTE: Deploy command
helm upgrade --install magnum ./magnum \
--namespace=openstack \
@ -25,7 +22,7 @@ helm upgrade --install magnum ./magnum \
${OSH_EXTRA_HELM_ARGS_MAGNUM}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/manila/manila.sh
View File

@ -15,12 +15,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(./tools/deployment/common/get-values-overrides.sh manila)"}
: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides -c manila ${FEATURES})"}
: ${RUN_HELM_TESTS:="no"}
#NOTE: Lint and package chart
make manila
#NOTE: Deploy command
helm upgrade --install --debug manila ./manila \
--namespace=openstack \
@ -28,4 +25,4 @@ helm upgrade --install --debug manila ./manila \
${OSH_EXTRA_HELM_ARGS_MANILA:=}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack 1800
helm osh wait-for-pods openstack 1800

5
tools/deployment/component/mistral/mistral.sh
View File

@ -15,9 +15,6 @@ set -xe
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Lint and package chart
make mistral
#NOTE: Deploy command
helm upgrade --install mistral ./mistral \
--namespace=openstack \
@ -29,7 +26,7 @@ helm upgrade --install mistral ./mistral \
${OSH_EXTRA_HELM_ARGS_MISTRAL}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment
export OS_CLOUD=openstack_helm

2
tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
View File

@ -34,4 +34,4 @@ helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh nfs
helm osh wait-for-pods nfs

4
tools/deployment/component/octavia/200-octavia.sh
View File

@ -16,8 +16,6 @@
set -xe
#NOTE: Lint and package chart
make octavia
export OS_CLOUD=openstack_helm
: ${OSH_LB_AMPHORA_IMAGE_NAME:="amphora-x64-haproxy"}
@ -115,7 +113,7 @@ helm upgrade --install octavia ./octavia \
${OSH_EXTRA_HELM_ARGS_OCTAVIA}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/ovn/120-openvswitch.sh
View File

@ -17,10 +17,7 @@ export FEATURE_GATES="ovn"
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(./tools/deployment/common/get-values-overrides.sh openvswitch)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} openvswitch
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -30,4 +27,4 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

18
tools/deployment/component/ovn/140-compute-kit.sh
View File

@ -18,7 +18,7 @@ export FEATURE_GATES="ovn"
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides -c nova ${FEATURES})"}
tee /tmp/pvc-ceph-client-key.yaml << EOF
AQAk//BhgQMXDxAAPwH86gbDjEEpmXC4s2ontw==
@ -26,20 +26,13 @@ EOF
kubectl -n openstack create secret generic pvc-ceph-client-key --from-file=key=/tmp/pvc-ceph-client-key.yaml || true
rm -f /tmp/pvc-ceph-client-key.yaml
#NOTE: Lint and package chart
make nova
helm upgrade --install nova ./nova \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_NOVA}
# Get overrides
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement)"}
# Lint and package
make placement
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides -c placement ${FEATURES})"}
# Deploy
helm upgrade --install placement ./placement \
@ -48,10 +41,7 @@ helm upgrade --install placement ./placement \
${OSH_EXTRA_HELM_ARGS_PLACEMENT}
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
#NOTE: Lint and package chart
make neutron
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides -c neutron ${FEATURES})"}
helm upgrade --install neutron ./neutron \
--namespace=openstack \
@ -60,7 +50,7 @@ helm upgrade --install neutron ./neutron \
${OSH_EXTRA_HELM_ARGS_NEUTRON}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
./tools/deployment/common/run-helm-tests.sh nova
./tools/deployment/common/run-helm-tests.sh neutron

7
tools/deployment/component/ovn/ovn.sh
View File

@ -17,10 +17,7 @@ export FEATURE_GATES="ovn"
#NOTE: Get the over-rides to use
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_EXTRA_HELM_ARGS_OVN:="$(./tools/deployment/common/get-values-overrides.sh ovn)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} ovn
: ${OSH_EXTRA_HELM_ARGS_OVN:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c ovn ${FEATURES})"}
tee /tmp/ovn.yaml << EOF
volume:
@ -46,4 +43,4 @@ helm upgrade --install ovn ${HELM_CHART_ROOT_PATH}/ovn \
${OSH_EXTRA_HELM_ARGS_OVN}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

5
tools/deployment/component/senlin/senlin.sh
View File

@ -13,9 +13,6 @@
# under the License.
set -xe
#NOTE: Lint and package chart
make senlin
#NOTE: Deploy command
helm upgrade --install senlin ./senlin \
--namespace=openstack \
@ -25,7 +22,7 @@ helm upgrade --install senlin ./senlin \
${OSH_EXTRA_HELM_ARGS_SENLIN}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm

7
tools/deployment/component/tacker/tacker.sh
View File

@ -14,12 +14,9 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(./tools/deployment/common/get-values-overrides.sh tacker)"}
: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides -c tacker ${FEATURES})"}
: ${RUN_HELM_TESTS:="no"}
#NOTE: Lint and package chart
make tacker
#NOTE: Deploy command
helm upgrade --install tacker ./tacker \
--namespace=openstack \
@ -27,4 +24,4 @@ helm upgrade --install tacker ./tacker \
${OSH_EXTRA_HELM_ARGS_TACKER}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

12
zuul.d/base.yaml
View File

@ -76,6 +76,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh
@ -101,6 +102,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh
@ -130,6 +132,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/cert-manager.sh
- ./tools/deployment/common/ingress.sh
@ -150,6 +153,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/ceph/ceph.sh
- ./tools/deployment/component/ceph/ceph-ns-activate.sh
@ -172,6 +176,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/ceph/ceph-rook.sh
- ./tools/deployment/component/ceph/ceph-adapter-rook.sh
@ -208,6 +213,7 @@
run_helm_tests: "yes"
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh
@ -227,6 +233,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- ./tools/deployment/component/common/mariadb.sh
@ -242,6 +249,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/cert-manager.sh
- ./tools/deployment/component/ceph/ceph.sh
@ -273,6 +281,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/common/ingress.sh
- - ./tools/deployment/component/common/mariadb.sh
@ -301,6 +310,7 @@
feature_gates: netpol
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/common/ingress.sh
- ./tools/deployment/common/lockdown-netpol.sh
@ -331,6 +341,7 @@
feature_gates: netpol
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/ceph/ceph.sh
- ./tools/deployment/component/ceph/ceph-ns-activate.sh
@ -353,6 +364,7 @@
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh