Move values overrides to a separate directory

This is the action item to implement the spec:
doc/source/specs/2025.1/chart_versioning.rst

Depends-On: I327103c18fc0e10e989a17f69b3bff9995c45eb4
Depends-On: I7bfdef3ea2128bbb4e26e3a00161fe30ce29b8e7
Change-Id: I4974785c904cf7c8730279854e3ad9b6b7c35498

doc/source/install/openstack.rst

@@ -62,12 +62,12 @@ Let's download the values overrides for the feature set defined above:
 
 .. code-block:: bash
 
-    INFRA_OVERRIDES_URL=https://opendev.org/openstack/openstack-helm-infra/raw/branch/master
+    INFRA_OVERRIDES_URL=https://opendev.org/openstack/openstack-helm-infra/raw/branch/master/values_overrides
     for chart in rabbitmq mariadb memcached openvswitch libvirt; do
         helm osh get-values-overrides -d -u ${INFRA_OVERRIDES_URL} -p ${OVERRIDES_DIR} -c ${chart} ${FEATURES}
     done
 
-    OVERRIDES_URL=https://opendev.org/openstack/openstack-helm/raw/branch/master
+    OVERRIDES_URL=https://opendev.org/openstack/openstack-helm/raw/branch/master/values_overrides
     for chart in keystone heat glance cinder placement nova neutron horizon; do
         helm osh get-values-overrides -d -u ${OVERRIDES_URL} -p ${OVERRIDES_DIR} -c ${chart} ${FEATURES}
     done

doc/source/specs/2025.1/chart_versioning.rst

@@ -85,7 +85,7 @@ implemented.
 Values overrides
 ~~~~~~~~~~~~~~~~
 Move values_overrides from all charts to a separate directory `values`
-with the hierarchy `values/<chart-name>/values_overrides/<feature1>_<feature2>.yaml`.
+with the hierarchy `values_overrides/<chart-name>/<feature1>_<feature2>.yaml`.
 The Openstack-Helm plugin is able to lookup the overrides in an arbitrary directory,
 but the directory structure must be as described above.
 

tools/deployment/common/lockdown-netpol.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c lockdown ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_LOCKDOWN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c lockdown ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install lockdown ${OSH_INFRA_HELM_REPO}/lockdown \

tools/deployment/common/openstack-exporter.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_OSEXPORTER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install prometheus-openstack-exporter ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \

tools/deployment/common/push-images.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+#set -x
+
+if [ "x$1" == "x" ]; then
+  CHART_DIRS="$(echo ./*/)"
+else
+  CHART_DIRS="$(echo ./$1/)"
+fi
+
+for CHART_DIR in ${CHART_DIRS} ; do
+#   echo $CHART_DIR
+  if [ -e ${CHART_DIR}values.yaml ]; then
+    for IMAGE in $(cat ${CHART_DIR}values.yaml | yq '.images.tags | map(.) | join(" ")' | tr -d '"'); do
+    #   sudo docker inspect $IMAGE >/dev/null|| sudo docker pull $IMAGE
+      echo $IMAGE
+    done
+  fi
+done

tools/deployment/component/aodh/aodh.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c aodh ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c aodh ${FEATURES})"}
 
 #NOTE: Wait for deploy
 helm upgrade --install aodh ${OSH_HELM_REPO}/aodh \

tools/deployment/component/barbican/barbican.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c barbican ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c barbican ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command

tools/deployment/component/ceilometer/ceilometer.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c ceilometer ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c ceilometer ${FEATURES})"}
 
 #NOTE: Wait for deploy
 helm upgrade --install ceilometer ${OSH_HELM_REPO}/ceilometer \

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

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ceph-provisioners ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ceph-provisioners ${FEATURES})"}
 
 #NOTE: Deploy command
 tee /tmp/ceph-openstack-config.yaml <<EOF

tools/deployment/component/ceph/ceph.sh

@@ -19,7 +19,7 @@ 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"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
 
 NUMBER_OF_OSDS="$(kubectl get nodes -l ceph-osd=enabled --no-headers | wc -l)"
 
@@ -181,7 +181,7 @@ for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
     --namespace=ceph \
     --values=/tmp/ceph.yaml \
     ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_CEPH:-$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ${CHART} ${FEATURES})}
+    ${OSH_EXTRA_HELM_ARGS_CEPH:-$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ${CHART} ${FEATURES})}
 
   #NOTE: Wait for deploy
   helm osh wait-for-pods ceph

tools/deployment/component/cinder/cinder.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c cinder ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c cinder ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command

tools/deployment/component/common/ldap.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ldap ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ldap ${FEATURES})"}
 
 #NOTE: Deploy command
 tee /tmp/ldap.yaml <<EOF

tools/deployment/component/common/mariadb.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c mariadb ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c mariadb ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \

tools/deployment/component/common/memcached.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c memcached ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c memcached ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install memcached ${OSH_INFRA_HELM_REPO}/memcached \

tools/deployment/component/common/openstack.sh

@@ -16,7 +16,7 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
 export OS_CLOUD=openstack_helm
 : "${RUN_HELM_TESTS:="no"}"
 : "${CEPH_ENABLED:="false"}"
@@ -65,18 +65,18 @@ neutron:
         node_selector_value: enabled
 EOF
 ## includes second argument 'subchart' to indicate a different path
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s mariadb ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s mariadb ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s rabbitmq ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s rabbitmq ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s memcached ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s memcached ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s keystone ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s keystone ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s heat ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s heat ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s glance ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s glance ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s openvswitch ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s openvswitch ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s libvirt ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s libvirt ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s nova ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s nova ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s placement ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s placement ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s neutron ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c openstack -s neutron ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c openstack -s horizon ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_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'

tools/deployment/component/common/rabbitmq.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c rabbitmq ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c rabbitmq ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \

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

@@ -15,10 +15,10 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c placement ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c placement ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c nova ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c nova ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c neutron ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c neutron ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 export OS_CLOUD=openstack_helm

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

@@ -22,8 +22,8 @@ fi
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c libvirt ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c libvirt ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install libvirt ${OSH_INFRA_HELM_REPO}/libvirt \

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

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c openvswitch ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c openvswitch ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install openvswitch ${OSH_INFRA_HELM_REPO}/openvswitch \

tools/deployment/component/glance/glance.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c glance ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c glance ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 : ${GLANCE_BACKEND:="pvc"}
 

tools/deployment/component/heat/heat.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c heat ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c heat ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install heat ${OSH_HELM_REPO}/heat \

tools/deployment/component/horizon/horizon.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c horizon ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c horizon ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command

tools/deployment/component/keystone/keystone.sh

@@ -16,8 +16,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c keystone ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c keystone ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command

tools/deployment/component/magnum/magnum.sh

@@ -13,8 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_MAGNUM:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c magnum ${FEATURES})"}
+: ${RUN_HELM_TESTS:="yes"}
+
 #NOTE: Deploy command
-helm upgrade --install magnum ./magnum \
+helm upgrade --install magnum ${OSH_HELM_REPO}/magnum \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.conductor=2 \

tools/deployment/component/manila/manila.sh

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

tools/deployment/component/mistral/mistral.sh

@@ -13,10 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_MISTRAL:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c mistral ${FEATURES})"}
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
-helm upgrade --install mistral ./mistral \
+helm upgrade --install mistral ${OSH_HELM_REPO}/mistral \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.engine=2 \

tools/deployment/component/nfs-provisioner/nfs-provisioner.sh

@@ -14,6 +14,11 @@
 
 set -xe
 
+#NOTE: Define variables
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
+: ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c nfs-provisioner ${FEATURES})"}
+
 tee /tmp/nfs-ns.yaml << EOF
 apiVersion: v1
 kind: Namespace
@@ -27,8 +32,7 @@ EOF
 kubectl create -f /tmp/nfs-ns.yaml
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+helm upgrade --install nfs-provisioner ${OSH_INFRA_HELM_REPO}/nfs-provisioner \
-helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
     --namespace=nfs \
     --set storageclass.name=general \
     ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}

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

@@ -1,30 +0,0 @@
-#!/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 -xe
-
-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 ${DOWNLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c openvswitch ${FEATURES})"}
-
-#NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
-  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS} \
-  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack

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

@@ -1,56 +0,0 @@
-#!/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 -xe
-
-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 ${DOWNLOAD_OVERRIDES:-} -c nova ${FEATURES})"}
-
-tee /tmp/pvc-ceph-client-key.yaml << EOF
-AQAk//BhgQMXDxAAPwH86gbDjEEpmXC4s2ontw==
-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
-
-helm upgrade --install nova ./nova \
-    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_NOVA}
-
-# Get overrides
-: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c placement ${FEATURES})"}
-
-# Deploy
-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_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -c neutron ${FEATURES})"}
-
-helm upgrade --install neutron ./neutron \
-    --namespace=openstack \
-    ${OSH_RELEASE_OVERRIDES_NEUTRON} \
-    ${OSH_EXTRA_HELM_ARGS} \
-    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
-
-./tools/deployment/common/run-helm-tests.sh nova
-./tools/deployment/common/run-helm-tests.sh neutron

tools/deployment/component/ovn/ovn.sh

@@ -13,11 +13,10 @@
 #    under the License.
 set -xe
 
-export FEATURE_GATES="ovn"
+#NOTE: Define variables
-
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
-#NOTE: Get the over-rides to use
+: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-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 ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c ovn ${FEATURES})"}
-: ${OSH_EXTRA_HELM_ARGS_OVN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${HELM_CHART_ROOT_PATH} -c ovn ${FEATURES})"}
 
 tee /tmp/ovn.yaml << EOF
 volume:
@@ -36,7 +35,7 @@ EOF
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install ovn ${HELM_CHART_ROOT_PATH}/ovn \
+helm upgrade --install ovn ${OSH_INFRA_HELM_REPO}/ovn \
   --namespace=openstack \
   --values=/tmp/ovn.yaml \
   ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/component/senlin/senlin.sh

@@ -13,8 +13,14 @@
 #    under the License.
 set -xe
 
+#NOTE: Define variables
+: ${OSH_HELM_REPO:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
+: ${OSH_EXTRA_HELM_ARGS_SENLIN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c senlin ${FEATURES})"}
+: ${RUN_HELM_TESTS:="yes"}
+
 #NOTE: Deploy command
-helm upgrade --install senlin ./senlin \
+helm upgrade --install senlin ${OSH_HELM_REPO}/senlin \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.engine=2 \

tools/deployment/component/tacker/tacker.sh

@@ -15,8 +15,8 @@ set -xe
 
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_PATH:="../openstack-helm"}
+: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"}
-: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c tacker ${FEATURES})"}
+: ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c tacker ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command