Merge "Add jobs consuming charts from Helm repos"

tools/deployment/baremetal/005-setup-nodes.sh

@@ -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"}"

tools/deployment/baremetal/110-compute-kit.sh

@@ -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

tools/deployment/common/lockdown-netpol.sh

@@ -13,19 +13,16 @@
 #    under the License.
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(./tools/deployment/common/get-values-overrides.sh lockdown)"}
+: ${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: Lint and package chart
-make -C ${HELM_CHART_ROOT_PATH} lockdown
 
 #NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
+helm upgrade --install lockdown ${OSH_INFRA_HELM_REPO}/lockdown \
-helm upgrade --install lockdown ${HELM_CHART_ROOT_PATH}/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

tools/deployment/common/openstack-exporter.sh

@@ -14,18 +14,16 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(./tools/deployment/common/get-values-overrides.sh prometheus-openstack-exporter)"}
+: ${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
+#NOTE: Deploy command
-make -C ${HELM_CHART_ROOT_PATH} prometheus-openstack-exporter
+helm upgrade --install prometheus-openstack-exporter ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \
-
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install prometheus-openstack-exporter ${HELM_CHART_ROOT_PATH}/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

tools/deployment/common/prepare-charts.sh

@@ -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
 )
 

tools/deployment/common/prepare-helm-repos-local.sh

@@ -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

tools/deployment/common/prepare-helm-repos-public.sh

@@ -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

tools/deployment/common/prepare-k8s.sh

@@ -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

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

@@ -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 \

tools/deployment/component/aodh/aodh.sh

@@ -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 \
+helm upgrade --install aodh ${OSH_HELM_REPO}/aodh \
-  --namespace=openstack \
+    --namespace=openstack \
-  --set pod.replicas.api=2 \
+    --set pod.replicas.api=2 \
-  --set pod.replicas.evaluator=2 \
+    --set pod.replicas.evaluator=2 \
-  --set pod.replicas.listener=2 \
+    --set pod.replicas.listener=2 \
-  --set pod.replicas.notifier=2 \
+    --set pod.replicas.notifier=2 \
-  ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS:=} \
-  ${OSH_EXTRA_HELM_ARGS_AODH}
+    ${OSH_EXTRA_HELM_ARGS_AODH}
 
 #NOTE: Wait for deploy
 helm osh wait-for-pods openstack

tools/deployment/component/barbican/barbican.sh

@@ -14,12 +14,14 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides -c barbican ${FEATURES})"}
+: ${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}

tools/deployment/component/ceilometer/ceilometer.sh

@@ -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

tools/deployment/component/ceph/ceph-ns-activate.sh

@@ -14,9 +14,10 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c ceph-provisioners ${FEATURES})"}
+: ${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 \
+helm upgrade --install ceph-openstack-config ${OSH_INFRA_HELM_REPO}/ceph-provisioners \
-  --namespace=openstack \
+    --namespace=openstack \
-  --values=/tmp/ceph-openstack-config.yaml \
+    --values=/tmp/ceph-openstack-config.yaml \
-  ${OSH_EXTRA_HELM_ARGS:=} \
+    ${OSH_EXTRA_HELM_ARGS:=} \
-  ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
+    ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
 
 #NOTE: Wait for deploy
 helm osh wait-for-pods openstack

tools/deployment/component/ceph/ceph.sh

@@ -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"}
-
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-#NOTE: Lint and package chart
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-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
 
 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:=} \
-    ${OSH_EXTRA_HELM_ARGS_CEPH:-$(./tools/deployment/common/get-values-overrides.sh ${CHART})}
+    ${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 \

tools/deployment/component/cinder/cinder.sh

@@ -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

tools/deployment/component/common/ldap.sh

@@ -14,12 +14,10 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(./tools/deployment/common/get-values-overrides.sh ldap)"}
+: ${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: Lint and package chart
-make -C ${HELM_CHART_ROOT_PATH} ldap
 
 #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

tools/deployment/component/common/mariadb.sh

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

tools/deployment/component/common/memcached.sh

@@ -14,13 +14,13 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c memcached ${FEATURES})"}
+: ${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 ${OSH_INFRA_HELM_REPO}/memcached \
-helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
     --namespace=openstack \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MEMCACHED}

tools/deployment/component/common/openstack.sh

@@ -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 ${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_MARIADB:="$(helm osh get-values-overrides -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_RABBITMQ:="$(helm osh get-values-overrides -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_MEMCACHED:="$(helm osh get-values-overrides -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_KEYSTONE:="$(helm osh get-values-overrides -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_HEAT:="$(helm osh get-values-overrides -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_GLANCE:="$(helm osh get-values-overrides -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_OPENVSWITCH:="$(helm osh get-values-overrides -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_LIBVIRT:="$(helm osh get-values-overrides -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_NOVA:="$(helm osh get-values-overrides -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_PLACEMENT:="$(helm osh get-values-overrides -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_NEUTRON:="$(helm osh get-values-overrides -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})"}
-: ${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'
@@ -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} \

tools/deployment/component/common/rabbitmq.sh

@@ -14,12 +14,13 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c rabbitmq ${FEATURES})"}
+: ${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 \

tools/deployment/component/compute-kit/compute-kit.sh

@@ -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
+#NOTE: Deploy placement
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides -c placement ${FEATURES})"}
+helm upgrade --install placement ${OSH_HELM_REPO}/placement --namespace=openstack \
-
+    ${OSH_EXTRA_HELM_ARGS:=} \
-# Deploy placement
+    ${OSH_EXTRA_HELM_ARGS_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 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

tools/deployment/component/compute-kit/libvirt.sh

@@ -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
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c libvirt ${FEATURES})"}
+: ${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 ${OSH_INFRA_HELM_REPO}/libvirt \
-helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --namespace=openstack \
   --set conf.ceph.enabled=${CEPH_ENABLED} \
   ${OSH_EXTRA_HELM_ARGS:=} \

tools/deployment/component/compute-kit/openvswitch.sh

@@ -13,12 +13,13 @@
 #    under the License.
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
+: ${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}

tools/deployment/component/compute-kit/tungsten-fabric.sh

@@ -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

tools/deployment/component/glance/glance.sh

@@ -14,13 +14,14 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides -c glance ${FEATURES})"}
+: ${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:=} \

tools/deployment/component/heat/heat.sh

@@ -13,12 +13,13 @@
 #    under the License.
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides -c heat ${FEATURES})"}
+: ${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 ${OSH_HELM_REPO}/heat \
-helm upgrade --install heat ./heat \
   --namespace=openstack \
   ${OSH_EXTRA_HELM_ARGS:=} \
   ${OSH_EXTRA_HELM_ARGS_HEAT}

tools/deployment/component/horizon/horizon.sh

@@ -14,12 +14,14 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides -c horizon ${FEATURES})"}
+: ${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}

tools/deployment/component/keystone/keystone.sh

@@ -14,15 +14,17 @@
 
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides -c keystone ${FEATURES})"}
+: ${OSH_HELM_REPO:="../openstack-helm"}
-: ${RUN_HELM_TESTS:="yes"}
+: ${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

tools/deployment/component/manila/manila.sh

@@ -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

tools/deployment/component/ovn/120-openvswitch.sh

@@ -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:=""}

tools/deployment/component/ovn/140-compute-kit.sh

@@ -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 \

tools/deployment/component/ovn/ovn.sh

@@ -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:

tools/deployment/component/tacker/tacker.sh

@@ -13,12 +13,14 @@
 #    under the License.
 set -xe
 
-#NOTE: Get the over-rides to use
+#NOTE: Define variables
-: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides -c tacker ${FEATURES})"}
+: ${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}

zuul.d/2024.1.yaml

@@ -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

zuul.d/base.yaml

@@ -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

zuul.d/project.yaml

@@ -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