Add components overrides retrieval to developer scripts

Change-Id: Id48c4a920f9463cd0b0283a13b0389e0927851a2

tools/deployment/common/memcached.sh

@@ -16,9 +16,12 @@
 
 set -xe
 
+#NOTE: Get the over-rides to use
+export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(./tools/deployment/common/get-values-overrides.sh memcached)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} memcached
-make -C ${OSH_INFRA_PATH} memcached
 
 tee /tmp/memcached.yaml <<EOF
 manifests:
@@ -76,7 +79,7 @@ EOF
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install memcached ${OSH_INFRA_PATH}/memcached \
+helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
     --namespace=openstack \
     --values=/tmp/memcached.yaml \
     ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/developer/ceph/040-ceph.sh

@@ -17,14 +17,12 @@
 set -xe
 
 #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 ${OSH_INFRA_PATH} "${CHART}"
+  make -C ${HELM_CHART_ROOT_PATH} "${CHART}"
 done
 
 #NOTE: Deploy command
-
-: ${OSH_EXTRA_HELM_ARGS:=""}
 [ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt
 CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
 #NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this
@@ -163,11 +161,18 @@ pod:
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
-  helm upgrade --install ${CHART} ${OSH_INFRA_PATH}/${CHART} \
+  #NOTE: Get the over-rides to use
+  if [ -z "${OSH_EXTRA_HELM_ARGS_CEPH}" ]; then
+      OSH_EXTRA_HELM_ARGS_CEPH_TMP="$(./tools/deployment/common/get-values-overrides.sh ${CHART})"
+  else
+      OSH_EXTRA_HELM_ARGS_CEPH_TMP="${OSH_EXTRA_HELM_ARGS_CEPH}"
+  fi
+
+  helm upgrade --install ${CHART} ${HELM_CHART_ROOT_PATH}/${CHART} \
     --namespace=ceph \
     --values=/tmp/ceph.yaml \
     ${OSH_EXTRA_HELM_ARGS} \
-    ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY}
+    ${OSH_EXTRA_HELM_ARGS_CEPH_TMP}
 
   #NOTE: Wait for deploy
   ./tools/deployment/common/wait-for-pods.sh ceph

tools/deployment/developer/ceph/045-ceph-ns-activate.sh

@@ -16,9 +16,12 @@
 
 set -xe
 
+#NOTE: Get the over-rides to use
+export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} ceph-provisioners
-make -C ${OSH_INFRA_PATH} ceph-provisioners
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
@@ -37,7 +40,7 @@ deployment:
 bootstrap:
   enabled: false
 EOF
-helm upgrade --install ceph-openstack-config ${OSH_INFRA_PATH}/ceph-provisioners \
+helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provisioners \
   --namespace=openstack \
   --values=/tmp/ceph-openstack-config.yaml \
   ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/developer/ceph/110-ceph-radosgateway.sh

@@ -16,9 +16,12 @@
 
 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_RGW:="$(./tools/deployment/common/get-values-overrides.sh ceph-rgw)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} ceph-rgw
-make -C ${OSH_INFRA_PATH} ceph-rgw
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
@@ -71,7 +74,7 @@ network_policy:
 manifests:
   network_policy: true
 EOF
-helm upgrade --install radosgw-openstack ${OSH_INFRA_PATH}/ceph-rgw \
+helm upgrade --install radosgw-openstack ${HELM_CHART_ROOT_PATH}/ceph-rgw \
   --namespace=openstack \
   --values=/tmp/radosgw-openstack.yaml \
   ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/developer/ceph/120-glance.sh

@@ -24,6 +24,10 @@ make glance
 : ${OSH_OPENSTACK_RELEASE:="newton"}
 #NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
 : ${GLANCE_BACKEND:="swift"}
+
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"}
+
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 EOF

tools/deployment/developer/ceph/130-cinder.sh

@@ -15,6 +15,9 @@
 #    under the License.
 set -xe
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
+
 #NOTE: Lint and package chart
 make cinder
 

tools/deployment/developer/ceph/150-libvirt.sh

@@ -15,9 +15,12 @@
 #    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_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} libvirt
-make -C ${OSH_INFRA_PATH} libvirt
 
 tee /tmp/libvirt.yaml <<EOF
 manifests:
@@ -30,7 +33,7 @@ EOF
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
+helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --namespace=openstack \
   --set manifests.network_policy=true \
   --values=/tmp/libvirt.yaml \

tools/deployment/developer/ceph/160-compute-kit.sh

@@ -15,6 +15,12 @@
 #    under the License.
 set -xe
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
+
+#NOTE: Lint and package chart
+
 #NOTE: Lint and package chart
 make nova
 make neutron

tools/deployment/developer/common/030-ingress.sh

@@ -16,12 +16,14 @@
 
 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_INGRESS:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} ingress
-make -C ${OSH_INFRA_PATH} ingress
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 tee /tmp/ingress-kube-system.yaml << EOF
 deployment:
@@ -30,10 +32,11 @@ deployment:
 network:
   host_namespace: true
 EOF
-helm upgrade --install ingress-kube-system ${OSH_INFRA_PATH}/ingress \
+helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=kube-system \
   --values=/tmp/ingress-kube-system.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS} \
   ${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}
 
 #NOTE: Wait for deploy
@@ -43,9 +46,10 @@ helm upgrade --install ingress-kube-system ${OSH_INFRA_PATH}/ingress \
 helm status ingress-kube-system
 
 #NOTE: Deploy namespace ingress
-helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \
+helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=openstack \
   ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS} \
   ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
 
 #NOTE: Wait for deploy
@@ -55,9 +59,10 @@ helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \
 helm status ingress-openstack
 
 
-helm upgrade --install ingress-ceph ${OSH_INFRA_PATH}/ingress \
+helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=ceph \
   ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS} \
   ${OSH_EXTRA_HELM_ARGS_INGRESS_CEPH}
 
 #NOTE: Wait for deploy

tools/deployment/developer/common/049-lockdown.sh

@@ -15,13 +15,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 lockdown
+make -C ${HELM_CHART_ROOT_PATH} lockdown
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install lockdown ${OSH_INFRA_PATH}/lockdown \
+helm upgrade --install lockdown ${HELM_CHART_ROOT_PATH}/lockdown \
     --namespace=openstack \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_LOCKDOWN}

tools/deployment/developer/common/050-mariadb.sh

@@ -16,13 +16,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_MARIADB:="$(./tools/deployment/common/get-values-overrides.sh mariadb)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} mariadb
-make -C ${OSH_INFRA_PATH} mariadb
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install mariadb ${OSH_INFRA_PATH}/mariadb \
+helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
     --namespace=openstack \
     --set pod.replicas.server=1 \
     ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/developer/common/060-rabbitmq.sh

@@ -16,13 +16,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_RABBITMQ:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} rabbitmq
-make -C ${OSH_INFRA_PATH} rabbitmq
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
+helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
     --namespace=openstack \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}

tools/deployment/developer/common/080-keystone.sh

@@ -19,6 +19,9 @@ set -xe
 #NOTE: Lint and package chart
 make keystone
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
+
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install keystone ./keystone \

tools/deployment/developer/common/090-heat.sh

@@ -15,6 +15,9 @@
 #    under the License.
 set -xe
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(./tools/deployment/common/get-values-overrides.sh heat)"}
+
 #NOTE: Lint and package chart
 make heat
 

tools/deployment/developer/common/100-horizon.sh

@@ -16,6 +16,9 @@
 
 set -xe
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(./tools/deployment/common/get-values-overrides.sh horizon)"}
+
 #NOTE: Lint and package chart
 make horizon
 

tools/deployment/developer/common/140-openvswitch.sh

@@ -15,13 +15,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_OPENVSWITCH:="$(./tools/deployment/common/get-values-overrides.sh openvswitch)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} openvswitch
-make -C ${OSH_INFRA_PATH} openvswitch
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
+helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
   --namespace=openstack \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}

tools/deployment/developer/ldap/080-keystone.sh

@@ -16,8 +16,11 @@
 
 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: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 
 tee /tmp/ldap.yaml <<EOF
@@ -41,7 +44,7 @@ network_policy:
           port: 389
 EOF
 
-helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
+helm upgrade --install ldap ${HELM_CHART_ROOT_PATH}/ldap \
     --namespace=openstack \
     --set pod.replicas.server=1 \
     --set bootstrap.enabled=true \
@@ -55,6 +58,10 @@ helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
 #NOTE: Validate Deployment info
 helm status ldap
 
+#NOTE: Get the over-rides to use
+export HELM_CHART_ROOT_PATH="../openstack-helm"
+: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
+
 #NOTE: Handle Keystone
 make pull-images keystone
 

tools/deployment/developer/nfs/120-glance.sh

@@ -19,6 +19,9 @@ set -xe
 #NOTE: Lint and package chart
 make glance
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"}
+
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
 : ${OSH_OPENSTACK_RELEASE:="newton"}

tools/deployment/developer/nfs/150-libvirt.sh

@@ -15,13 +15,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_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"}
+
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${HELM_CHART_ROOT_PATH} libvirt
-make -C ${OSH_INFRA_PATH} libvirt
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
+helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --namespace=openstack \
   --set conf.ceph.enabled=false \
   ${OSH_EXTRA_HELM_ARGS} \

tools/deployment/developer/nfs/160-compute-kit.sh

@@ -15,6 +15,10 @@
 #    under the License.
 set -xe
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
+: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
+
 #NOTE: Lint and package chart
 make nova
 make neutron