Gate: allow chart specific over-rides to be applied

This PS allows chart specific over-rides to be appled to each chart using the gate scripts. Change-Id: Ie259113a129cddd84743c891be76782227e3bd24
2026-01-08 16:41:39 +00:00 · 2018-03-08 01:02:42 +00:00
parent 766ada1091
commit 47eaa69860
41 changed files with 121 additions and 48 deletions
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -157,7 +157,8 @@ EOF
 helm upgrade --install ceph ./ceph \
  --namespace=ceph \
  --values=/tmp/ceph.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -52,7 +52,8 @@ EOF
 helm upgrade --install ceph-openstack-config ./ceph \
  --namespace=openstack \
  --values=/tmp/ceph-openstack-config.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -52,7 +52,8 @@ EOF
 helm upgrade --install radosgw-openstack ./ceph \
  --namespace=openstack \
  --values=/tmp/radosgw-openstack.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_RGW}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -25,7 +25,8 @@ GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift
 helm upgrade --install glance ./glance \
  --namespace=openstack \
  --set storage=${GLANCE_BACKEND} \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GLANCE}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/ceph/130-cinder.sh
+++ b/tools/deployment/developer/ceph/130-cinder.sh
@@ -22,7 +22,8 @@ make pull-images cinder
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install cinder ./cinder \
  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CINDER}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/ceph/150-libvirt.sh
+++ b/tools/deployment/developer/ceph/150-libvirt.sh
@@ -22,7 +22,8 @@ make pull-images libvirt
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ./libvirt \
  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -25,13 +25,15 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
  echo 'OSH is not being deployed in virtualized environment'
  helm upgrade --install nova ./nova \
      --namespace=openstack \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
  echo 'OSH is being deployed in virtualized environment, using qemu for nova'
  helm upgrade --install nova ./nova \
      --namespace=openstack \
      --set conf.nova.libvirt.virt_type=qemu \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi

 #NOTE: Deploy neutron
@@ -65,7 +67,8 @@ EOF
 helm upgrade --install neutron ./neutron \
    --namespace=openstack \
    --values=/tmp/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -31,11 +31,14 @@ EOF
 helm upgrade --install ingress-kube-system ./ingress \
  --namespace=kube-system \
  --values=/tmp/ingress-kube-system.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}

 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-openstack ./ingress \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
--- a/tools/deployment/developer/common/050-mariadb.sh
+++ b/tools/deployment/developer/common/050-mariadb.sh
@@ -24,7 +24,8 @@ make pull-images mariadb
 helm upgrade --install mariadb ./mariadb \
    --namespace=openstack \
    --set pod.replicas.server=1 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_MARIADB}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -24,7 +24,8 @@ make pull-images rabbitmq
 helm upgrade --install rabbitmq ./rabbitmq \
    --namespace=openstack \
    --set pod.replicas.server=1 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_RABBITMQ}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/080-keystone.sh
+++ b/tools/deployment/developer/common/080-keystone.sh
@@ -23,7 +23,8 @@ make pull-images keystone
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install keystone ./keystone \
    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_KEYSTONE}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/090-heat.sh
+++ b/tools/deployment/developer/common/090-heat.sh
@@ -22,7 +22,8 @@ make pull-images heat
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install heat ./heat \
  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -25,7 +25,8 @@ helm upgrade --install horizon ./horizon \
    --namespace=openstack \
    --set network.node_port.enabled=true \
    --set network.node_port.port=31000 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_HORIZON}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -22,7 +22,8 @@ make pull-images openvswitch
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install openvswitch ./openvswitch \
  --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/nfs/040-nfs-provisioner.sh
+++ b/tools/deployment/developer/nfs/040-nfs-provisioner.sh
@@ -20,7 +20,8 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
    --namespace=nfs \
-    --set storageclass.name=general
+    --set storageclass.name=general \
+    ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh nfs
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -24,7 +24,8 @@ make pull-images glance
 helm upgrade --install glance ./glance \
  --namespace=openstack \
  --set storage=pvc \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GLANCE}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -23,7 +23,8 @@ make pull-images libvirt
 helm upgrade --install libvirt ./libvirt \
  --namespace=openstack \
  --set ceph.enabled=false \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -26,14 +26,16 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
  helm upgrade --install nova ./nova \
      --namespace=openstack \
      --set ceph.enabled=false \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
  echo 'OSH is being deployed in virtualized environment, using qemu for nova'
  helm upgrade --install nova ./nova \
      --namespace=openstack \
      --set ceph.enabled=false \
      --set conf.nova.libvirt.virt_type=qemu \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi

 #NOTE: Deploy neutron
@@ -65,7 +67,8 @@ EOF
 helm upgrade --install neutron ./neutron \
    --namespace=openstack \
    --values=/tmp/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack