openstack
/
openstack-helm
Code Issues Proposed changes

Add jobs consuming charts from Helm repos 

Depends-On: Ic92b97eb5df4f7f8c4185c06654de4b4d890fbc6
Change-Id: If5dd37db9ed6f75a789c0fc808446752bbf87890
This commit is contained in:
Vladimir Kozhukalov 2024-04-23 23:35:25 -05:00
parent 1df157aa08
commit 18d92f0eb0
36 changed files with 294 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/baremetal/005-setup-nodes.sh
View File

@ -36,7 +36,7 @@ helm install ${OSH_INFRA_PATH}/libvirt \
#NOTE: Wait for deploy
sleep 5 #NOTE(portdirect): work around k8s not immedately assigning pods to nodes
./tools/deployment/common/wait-for-pods.sh libvirt
helm osh wait-for-pods libvirt
#NOTE: Create domains and start vbmc for ironic to manage as baremetal nodes
LIBVIRT_PODS=$(kubectl get --namespace libvirt pods \
@ -73,7 +73,7 @@ helm install ${OSH_INFRA_PATH}/openvswitch \
--name=openvswitch
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
#NOTE: Setup GRE tunnels between deployment node and libvirt hosts
OSH_IRONIC_PXE_DEV="${OSH_IRONIC_PXE_DEV:="ironic-pxe"}"

2
tools/deployment/baremetal/110-compute-kit.sh
View File

@ -131,7 +131,7 @@ helm upgrade --install nova ./nova \
${OSH_EXTRA_HELM_ARGS_NOVA}
#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/common/lockdown-netpol.sh
View File

@ -13,19 +13,16 @@
# under the License.
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_LOCKDOWN:="$(./tools/deployment/common/get-values-overrides.sh lockdown)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} lockdown
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c lockdown ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install lockdown ${HELM_CHART_ROOT_PATH}/lockdown \
helm upgrade --install lockdown ${OSH_INFRA_HELM_REPO}/lockdown \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_LOCKDOWN}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

18
tools/deployment/common/openstack-exporter.sh
View File

@ -14,18 +14,16 @@
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_OSEXPORTER:="$(./tools/deployment/common/get-values-overrides.sh prometheus-openstack-exporter)"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} prometheus-openstack-exporter
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install prometheus-openstack-exporter ${HELM_CHART_ROOT_PATH}/prometheus-openstack-exporter \
#NOTE: Deploy command
helm upgrade --install prometheus-openstack-exporter ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_OSEXPORTER}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

3
tools/deployment/common/prepare-charts.sh
View File

@ -14,9 +14,8 @@
set -ex
# Build all OSH Infra charts (necessary for Openstack deployment)
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
(
cd ${OSH_INFRA_PATH} &&
cd ${OSH_INFRA_PATH:-"../openstack-helm-infra"} &&
make all
)

31
tools/deployment/common/prepare-helm-repos-local.sh Executable file
View File

@ -0,0 +1,31 @@
#!/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
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
(
cd ${OSH_INFRA_PATH} &&
helm repo index ./
)
helm repo index ./
docker run -d --name nginx_charts \
-v $(pwd):/usr/share/nginx/html/openstack-helm:ro \
-v $(readlink -f ${OSH_INFRA_PATH}):/usr/share/nginx/html/openstack-helm-infra:ro \
-p 80:80 \
nginx
helm repo add ${OSH_HELM_REPO:-"openstack-helm"} http://localhost/openstack-helm
helm repo add ${OSH_INFRA_HELM_REPO:-"openstack-helm-infra"} http://localhost/openstack-helm-infra

17
tools/deployment/common/prepare-helm-repos-public.sh Executable file
View File

@ -0,0 +1,17 @@
#!/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
helm repo add ${OSH_HELM_REPO:-"openstack-helm"} https://tarballs.opendev.org/openstack/openstack-helm
helm repo add ${OSH_INFRA_HELM_REPO:-"openstack-helm-infra"} https://tarballs.opendev.org/openstack/openstack-helm-infra

7
tools/deployment/common/prepare-k8s.sh
View File

@ -46,10 +46,3 @@ EOF
kubectl apply -f /tmp/${NAMESPACE}-ns.yaml
done
#NOTE: Build helm-toolkit, most charts depend on helm-toolkit
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
make -C ${HELM_CHART_ROOT_PATH} helm-toolkit
# Build all charts
make all

2
tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh
View File

@ -37,7 +37,7 @@ validate_only_expected_application_changes () {
${config_change} \
--wait
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
kubectl get daemonsets,deployments,statefulsets \
--namespace openstack \

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

@ -13,15 +13,20 @@
# under the License.
set -xe
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c aodh ${FEATURES})"}
#NOTE: Wait for deploy
helm upgrade --install aodh ./aodh \
--namespace=openstack \
--set pod.replicas.api=2 \
--set pod.replicas.evaluator=2 \
--set pod.replicas.listener=2 \
--set pod.replicas.notifier=2 \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_AODH}
helm upgrade --install aodh ${OSH_HELM_REPO}/aodh \
--namespace=openstack \
--set pod.replicas.api=2 \
--set pod.replicas.evaluator=2 \
--set pod.replicas.listener=2 \
--set pod.replicas.notifier=2 \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_AODH}
#NOTE: Wait for deploy
helm osh wait-for-pods openstack

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

@ -14,12 +14,14 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides -c barbican ${FEATURES})"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c barbican ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Deploy command
helm upgrade --install barbican ./barbican \
helm upgrade --install barbican ${OSH_HELM_REPO}/barbican \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_BARBICAN}

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

@ -13,14 +13,19 @@
# under the License.
set -xe
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c ceilometer ${FEATURES})"}
#NOTE: Wait for deploy
helm upgrade --install ceilometer ./ceilometer \
helm upgrade --install ceilometer ${OSH_HELM_REPO}/ceilometer \
--namespace=openstack \
--set pod.replicas.api=2 \
--set pod.replicas.central=2 \
--set pod.replicas.collector=2 \
--set pod.replicas.notification=2 \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_CEILOMETER}
#NOTE: Wait for deploy

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

@ -14,9 +14,10 @@
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c ceph-provisioners ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ceph-provisioners ${FEATURES})"}
#NOTE: Deploy command
tee /tmp/ceph-openstack-config.yaml <<EOF
@ -40,11 +41,11 @@ conf:
mon_host: ceph-mon-discovery.ceph.svc.cluster.local:6789
mon_allow_pool_size_one: true
EOF
helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provisioners \
--namespace=openstack \
--values=/tmp/ceph-openstack-config.yaml \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
helm upgrade --install ceph-openstack-config ${OSH_INFRA_HELM_REPO}/ceph-provisioners \
--namespace=openstack \
--values=/tmp/ceph-openstack-config.yaml \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
#NOTE: Wait for deploy
helm osh wait-for-pods openstack

18
tools/deployment/component/ceph/ceph.sh
View File

@ -14,16 +14,12 @@
set -xe
#NOTE: Define variables
export CEPH_ENABLED=true
: ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
: ${POD_NETWORK_CIDR:="10.244.0.0/24"}
#NOTE: Lint and package chart
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
make -C ${HELM_CHART_ROOT_PATH} "${CHART}"
done
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
NUMBER_OF_OSDS="$(kubectl get nodes -l ceph-osd=enabled --no-headers | wc -l)"
@ -181,14 +177,14 @@ EOF
for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
helm upgrade --install ${CHART} ${HELM_CHART_ROOT_PATH}/${CHART} \
helm upgrade --install ${CHART} ${OSH_INFRA_HELM_REPO}/${CHART} \
--namespace=ceph \
--values=/tmp/ceph.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_CEPH:-$(./tools/deployment/common/get-values-overrides.sh ${CHART})}
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_CEPH:-$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ${CHART} ${FEATURES})}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph
helm osh wait-for-pods ceph
#NOTE: Validate deploy
MON_POD=$(kubectl get pods \

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

@ -14,7 +14,7 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides -c cinder ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -c cinder ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Deploy command

14
tools/deployment/component/common/ldap.sh
View File

@ -14,12 +14,10 @@
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_LDAP:="$(./tools/deployment/common/get-values-overrides.sh ldap)"}
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} ldap
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ldap ${FEATURES})"}
#NOTE: Deploy command
tee /tmp/ldap.yaml <<EOF
@ -32,11 +30,11 @@ storage:
pvc:
enabled: false
EOF
helm upgrade --install ldap ${HELM_CHART_ROOT_PATH}/ldap \
helm upgrade --install ldap ${OSH_INFRA_HELM_REPO}/ldap \
--namespace=openstack \
--values=/tmp/ldap.yaml \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_LDAP}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack

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

@ -14,13 +14,13 @@
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c mariadb ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c mariadb ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
--namespace=openstack \
--set volume.use_local_path_for_single_pod_cluster.enabled=true \
--set volume.enabled=false \

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

@ -14,13 +14,13 @@
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c memcached ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c memcached ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
helm upgrade --install memcached ${OSH_INFRA_HELM_REPO}/memcached \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_MEMCACHED}

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

@ -14,6 +14,9 @@
set -xe
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
export OSH_TEST_TIMEOUT=1200
export OS_CLOUD=openstack_helm
: "${RUN_HELM_TESTS:="no"}"
@ -67,19 +70,18 @@ neutron:
node_selector_value: enabled
EOF
## includes second argument 'subchart' to indicate a different path
export HELM_CHART_ROOT_PATH="../openstack-helm/openstack"
: ${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})"}
: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s mariadb ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s rabbitmq ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s memcached ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s keystone ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s heat ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s glance ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s openvswitch ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s libvirt ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s nova ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s placement ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s neutron ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s horizon ${FEATURES})"}
if [ "x$(systemd-detect-virt)" != "xnone" ]; then
echo 'OSH is being deployed in virtualized environment, using qemu for nova'
@ -96,7 +98,7 @@ fi
helm dependency update openstack
echo "helm installing openstack..."
helm upgrade --install $release openstack/ \
helm upgrade --install $release ${OSH_HELM_REPO}/openstack \
${OSH_EXTRA_HELM_ARGS_MARIADB} \
${OSH_EXTRA_HELM_ARGS_RABBITMQ} \
${OSH_EXTRA_HELM_ARGS_MEMCACHED} \

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

@ -14,12 +14,13 @@
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c rabbitmq ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c rabbitmq ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
--namespace=openstack \
--set volume.enabled=false \
--set pod.replicas.server=1 \

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

@ -13,6 +13,12 @@
# under the License.
set -xe
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c placement ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c nova ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c neutron ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
export OS_CLOUD=openstack_helm
@ -22,21 +28,16 @@ if openstack service list -f value -c Type | grep -q "^volume" && \
CEPH_ENABLED=true
fi
# Get overrides
: ${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:="$(helm osh get-values-overrides -c nova ${FEATURES})"}
#NOTE: Deploy placement
helm upgrade --install placement ${OSH_HELM_REPO}/placement --namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_PLACEMENT}
#NOTE: Deploy nova
: ${OSH_EXTRA_HELM_ARGS:=""}
if [ "x$(systemd-detect-virt)" == "xnone" ] || [ "x$(systemd-detect-virt)" == "xkvm" ]; then
echo 'OSH is not being deployed in virtualized environment'
helm upgrade --install nova ./nova \
helm upgrade --install nova ${OSH_HELM_REPO}/nova \
--namespace=openstack \
--set bootstrap.wait_for_computes.enabled=true \
--set conf.ceph.enabled=${CEPH_ENABLED} \
@ -44,7 +45,7 @@ if [ "x$(systemd-detect-virt)" == "xnone" ] || [ "x$(systemd-detect-virt)" == "x
${OSH_EXTRA_HELM_ARGS_NOVA}
else
echo 'OSH is being deployed in virtualized environment, using qemu for nova'
helm upgrade --install nova ./nova \
helm upgrade --install nova ${OSH_HELM_REPO}/nova \
--namespace=openstack \
--set bootstrap.wait_for_computes.enabled=true \
--set conf.ceph.enabled=${CEPH_ENABLED} \
@ -54,9 +55,6 @@ else
${OSH_EXTRA_HELM_ARGS_NOVA}
fi
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides -c neutron ${FEATURES})"}
#NOTE: Deploy neutron
tee /tmp/neutron.yaml << EOF
network:
@ -92,14 +90,12 @@ labels:
node_selector_value: enabled
EOF
helm upgrade --install neutron ./neutron \
helm upgrade --install neutron ${OSH_HELM_REPO}/neutron \
--namespace=openstack \
--values=/tmp/neutron.yaml \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_NEUTRON}
# If compute kit installed using Tungsten Fubric, it will be alive when Tunsten Fabric become active.
if [[ "$FEATURE_GATES" =~ (,|^)tf(,|$) ]]; then
exit 0

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

@ -20,13 +20,13 @@ if openstack service list -f value -c Type | grep -q "^volume" && \
CEPH_ENABLED=true
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c libvirt ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c libvirt ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
helm upgrade --install libvirt ${OSH_INFRA_HELM_REPO}/libvirt \
--namespace=openstack \
--set conf.ceph.enabled=${CEPH_ENABLED} \
${OSH_EXTRA_HELM_ARGS:=} \

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

@ -13,12 +13,13 @@
# under the License.
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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
#NOTE: Define variables
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c openvswitch ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
helm upgrade --install openvswitch ${OSH_INFRA_HELM_REPO}/openvswitch \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}

4
tools/deployment/component/compute-kit/tungsten-fabric.sh
View File

@ -216,14 +216,14 @@ EOF
kubectl label nodes --all opencontrail.org/controller=enabled
# wait for tf pods
./tools/deployment/common/wait-for-pods.sh tungsten-fabric
helm osh wait-for-pods tungsten-fabric
echo "INFO: Tungsten Fabric info"
# Display contrail state
sudo contrail-status
kubectl get pods -n tungsten-fabric
# wait for openstack pods
./tools/deployment/common/wait-for-pods.sh openstack
helm osh wait-for-pods openstack
# run couple of openstack commands and nova tests
openstack compute service list

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

@ -14,13 +14,14 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides -c glance ${FEATURES})"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c glance ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
: ${GLANCE_BACKEND:="pvc"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
: ${GLANCE_BACKEND:="pvc"}
tee /tmp/glance.yaml <<EOF
storage: ${GLANCE_BACKEND}
volume:
@ -33,7 +34,8 @@ bootstrap:
source_url: "http://download.cirros-cloud.net/0.6.2/"
image_file: "cirros-0.6.2-x86_64-disk.img"
EOF
helm upgrade --install glance ./glance \
helm upgrade --install glance ${OSH_HELM_REPO}/glance \
--namespace=openstack \
--values=/tmp/glance.yaml \
${OSH_EXTRA_HELM_ARGS:=} \

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

@ -13,12 +13,13 @@
# under the License.
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides -c heat ${FEATURES})"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c heat ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install heat ./heat \
helm upgrade --install heat ${OSH_HELM_REPO}/heat \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_HEAT}

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

@ -14,12 +14,14 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides -c horizon ${FEATURES})"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c horizon ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Deploy command
helm upgrade --install horizon ./horizon \
helm upgrade --install horizon ${OSH_HELM_REPO}/horizon \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_HORIZON}

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

@ -14,15 +14,17 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides -c keystone ${FEATURES})"}
: ${RUN_HELM_TESTS:="yes"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c keystone ${FEATURES})"}
: ${RUN_HELM_TESTS:="no"}
#NOTE: Deploy command
helm upgrade --install keystone ./keystone \
helm upgrade --install keystone ${OSH_HELM_REPO}/keystone \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_KEYSTONE:=}
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
#NOTE: Wait for deploy
helm osh wait-for-pods openstack

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

@ -15,7 +15,7 @@
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides -c manila ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -c manila ${FEATURES})"}
: ${RUN_HELM_TESTS:="no"}
#NOTE: Deploy command

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

@ -17,7 +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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}

6
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:="$(helm osh get-values-overrides -c nova ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -c nova ${FEATURES})"}
tee /tmp/pvc-ceph-client-key.yaml << EOF
AQAk//BhgQMXDxAAPwH86gbDjEEpmXC4s2ontw==
@ -32,7 +32,7 @@ helm upgrade --install nova ./nova \
${OSH_EXTRA_HELM_ARGS_NOVA}
# Get overrides
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides -c placement ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -c placement ${FEATURES})"}
# Deploy
helm upgrade --install placement ./placement \
@ -41,7 +41,7 @@ helm upgrade --install placement ./placement \
${OSH_EXTRA_HELM_ARGS_PLACEMENT}
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides -c neutron ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} ${DOWLOAD_OVERRIDES:-} -c neutron ${FEATURES})"}
helm upgrade --install neutron ./neutron \
--namespace=openstack \

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

@ -17,7 +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:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c ovn ${FEATURES})"}
: ${OSH_EXTRA_HELM_ARGS_OVN:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c ovn ${FEATURES})"}
tee /tmp/ovn.yaml << EOF
volume:

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

@ -13,12 +13,14 @@
# under the License.
set -xe
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides -c tacker ${FEATURES})"}
#NOTE: Define variables
: ${OSH_HELM_REPO:="../openstack-helm"}
: ${OSH_PATH:="../openstack-helm"}
: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWLOAD_OVERRIDES:-} -p ${OSH_PATH} -c tacker ${FEATURES})"}
: ${RUN_HELM_TESTS:="no"}
#NOTE: Deploy command
helm upgrade --install tacker ./tacker \
helm upgrade --install tacker ${OSH_HELM_REPO}/tacker \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_TACKER}

24
zuul.d/2024.1.yaml
View File

@ -64,6 +64,30 @@
container_distro_version: jammy
feature_gates: metallb
- job:
name: openstack-helm-compute-kit-helm-repo-local-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit-helm-repo-local
nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
vars:
metallb_setup: true
osh_params:
openstack_release: "2024.1"
container_distro_name: ubuntu
container_distro_version: jammy
feature_gates: metallb
- job:
name: openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit-helm-repo-public
nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
vars:
metallb_setup: true
osh_params:
openstack_release: "2024.1"
container_distro_name: ubuntu
container_distro_version: jammy
feature_gates: metallb
- job:
name: openstack-helm-compute-kit-ovn-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit-ovn

59
zuul.d/base.yaml
View File

@ -95,6 +95,65 @@
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-helm-repo-local
parent: openstack-helm-deploy
abstract: true
vars:
osh_helm_repo: openstack-helm
osh_infra_helm_repo: openstack-helm-infra
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/prepare-helm-repos-local.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/common/mariadb.sh
- ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/keystone/keystone.sh
- - ./tools/deployment/component/heat/heat.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh
- ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh
- export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron
- ./tools/deployment/common/run-helm-tests.sh nova
- ./tools/deployment/common/run-helm-tests.sh glance
- ./tools/deployment/common/run-helm-tests.sh keystone
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-helm-repo-public
parent: openstack-helm-deploy
abstract: true
vars:
osh_helm_repo: openstack-helm
osh_infra_helm_repo: openstack-helm-infra
download_overrides: "-d"
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/prepare-helm-repos-public.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/common/mariadb.sh
- ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/keystone/keystone.sh
- - ./tools/deployment/component/heat/heat.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh
- ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh
- export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron
- ./tools/deployment/common/run-helm-tests.sh nova
- ./tools/deployment/common/run-helm-tests.sh glance
- ./tools/deployment/common/run-helm-tests.sh keystone
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-ovn
parent: openstack-helm-deploy

4
zuul.d/project.yaml
View File

@ -50,6 +50,7 @@
- openstack-helm-cinder-2024-1-ubuntu_jammy # 3 nodes rook
- openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes
- openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 nodes
- openstack-helm-compute-kit-helm-repo-local-2024-1-ubuntu_jammy # 1 node + 2 nodes
gate:
jobs:
- openstack-helm-lint
@ -74,3 +75,6 @@
- openstack-helm-horizon-zed-ubuntu_jammy
- openstack-helm-umbrella-zed-ubuntu_focal
- openstack-helm-umbrella-zed-ubuntu_jammy
periodic:
jobs:
- openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy # 1 node + 2 nodes