From b77d3f3538d5a587e125a75057461f5a93163d1f Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Thu, 8 Feb 2018 12:29:50 -0500
Subject: [PATCH] Gate/Docs: Update developer deploy scripts

This PS udpates the developer deploy scripts to enable simple
upgrades/updates of services.

Change-Id: I0ef5a6dcc9094cb1aac565141b782f9e83ad9d71
---
 tools/deployment/common/memcached.sh          |  3 +++
 tools/deployment/developer/ceph/040-ceph.sh   |  8 +++----
 .../developer/ceph/045-ceph-ns-activate.sh    |  8 +++----
 .../developer/ceph/110-ceph-radosgateway.sh   |  8 +++----
 tools/deployment/developer/ceph/120-glance.sh |  3 +--
 tools/deployment/developer/ceph/130-cinder.sh |  5 ++--
 .../deployment/developer/ceph/150-libvirt.sh  |  5 ++--
 .../developer/ceph/160-compute-kit.sh         | 11 ++++-----
 .../developer/common/030-ingress.sh           | 23 +++++++++----------
 .../developer/common/050-mariadb.sh           |  3 +--
 .../developer/common/060-rabbitmq.sh          |  3 +--
 .../developer/common/080-keystone.sh          |  5 ++--
 tools/deployment/developer/common/090-heat.sh |  5 ++--
 .../developer/common/100-horizon.sh           |  3 +--
 .../developer/common/140-openvswitch.sh       |  5 ++--
 .../developer/nfs/040-nfs-provisioner.sh      |  3 +--
 tools/deployment/developer/nfs/120-glance.sh  |  3 +--
 tools/deployment/developer/nfs/150-libvirt.sh |  3 +--
 .../developer/nfs/160-compute-kit.sh          | 13 ++++-------
 19 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index ebd6bb4d21..984a536b88 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -16,6 +16,9 @@
 
 set -xe
 
+#NOTE: Pull images and lint chart
+make pull-images memcached
+
 #NOTE: Deploy command
 helm upgrade --install memcached ./memcached \
     --namespace=openstack
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index 6b39c1bedb..e3a80e52c3 100755
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -21,7 +21,8 @@ make pull-images ceph
 
 #NOTE: Deploy command
 uuidgen > /tmp/ceph-fs-uuid.txt
-cat > /tmp/ceph.yaml <<EOF
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/ceph.yaml <<EOF
 endpoints:
   identity:
     namespace: openstack
@@ -47,14 +48,13 @@ conf:
   ceph:
     config:
       global:
-        fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+        fsid: ${CEPH_FS_ID}
         osd_pool_default_size: 1
       osd:
         osd_crush_chooseleaf_type: 0
 EOF
-helm install ./ceph \
+helm upgrade --install ceph ./ceph \
   --namespace=ceph \
-  --name=ceph \
   --values=/tmp/ceph.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index 159c32b56d..7cee4f7bff 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -20,7 +20,8 @@ set -xe
 make pull-images ceph
 
 #NOTE: Deploy command
-cat > /tmp/ceph-openstack-config.yaml <<EOF
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/ceph-openstack-config.yaml <<EOF
 endpoints:
   identity:
     namespace: openstack
@@ -47,13 +48,12 @@ conf:
     config:
       global:
         osd_pool_default_size: 1
-        fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+        fsid: ${CEPH_FS_ID}
       osd:
         osd_crush_chooseleaf_type: 0
 EOF
-helm install ./ceph \
+helm upgrade --install ceph-openstack-config ./ceph \
   --namespace=openstack \
-  --name=ceph-openstack-config \
   --values=/tmp/ceph-openstack-config.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index 68b4bb2999..f35770b8ca 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -20,7 +20,8 @@ set -xe
 make pull-images ceph
 
 #NOTE: Deploy command
-cat > /tmp/radosgw-openstack.yaml <<EOF
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/radosgw-openstack.yaml <<EOF
 endpoints:
   identity:
     namespace: openstack
@@ -47,13 +48,12 @@ conf:
     config:
       global:
         osd_pool_default_size: 1
-        fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+        fsid: ${CEPH_FS_ID}
       osd:
         osd_crush_chooseleaf_type: 0
 EOF
-helm install ./ceph \
+helm upgrade --install radosgw-openstack ./ceph \
   --namespace=openstack \
-  --name=radosgw-openstack \
   --values=/tmp/radosgw-openstack.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 3f0f2425cf..2f569abc29 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -21,9 +21,8 @@ make pull-images glance
 
 #NOTE: Deploy command
 GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
-helm install ./glance \
+helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --name=glance \
   --set storage=${GLANCE_BACKEND}
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/ceph/130-cinder.sh b/tools/deployment/developer/ceph/130-cinder.sh
index 3387a33a29..06e8e04939 100755
--- a/tools/deployment/developer/ceph/130-cinder.sh
+++ b/tools/deployment/developer/ceph/130-cinder.sh
@@ -19,9 +19,8 @@ set -xe
 make pull-images cinder
 
 #NOTE: Deploy command
-helm install ./cinder \
-  --namespace=openstack \
-  --name=cinder
+helm upgrade --install cinder ./cinder \
+  --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh
index c34dcc2c30..0971289509 100755
--- a/tools/deployment/developer/ceph/150-libvirt.sh
+++ b/tools/deployment/developer/ceph/150-libvirt.sh
@@ -19,9 +19,8 @@ set -xe
 make pull-images libvirt
 
 #NOTE: Deploy command
-helm install ./libvirt \
-  --namespace=openstack \
-  --name=libvirt
+helm upgrade --install libvirt ./libvirt \
+  --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh
index daba0d4778..a4a9eff447 100755
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -22,14 +22,12 @@ make pull-images neutron
 #NOTE: Deploy nova
 if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
-  helm install ./nova \
-      --namespace=openstack \
-      --name=nova
+  helm upgrade --install nova ./nova \
+      --namespace=openstack
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
-  helm install ./nova \
+  helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --name=nova \
       --set conf.nova.libvirt.virt_type=qemu
 fi
 
@@ -56,9 +54,8 @@ conf:
       ovs:
         bridge_mappings: public:br-ex
 EOF
-helm install ./neutron \
+helm upgrade --install neutron ./neutron \
     --namespace=openstack \
-    --name=neutron \
     --values=/tmp/neutron.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index 984f8b9a3f..f81367a1b0 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -19,21 +19,20 @@ set -xe
 #NOTE: Pull images and lint chart
 make pull-images ingress
 
-#NOTE: Deploy global ingress
-helm install ./ingress \
+tee /tmp/ingress-kube-system.yaml << EOF
+deployment:
+  mode: cluster
+  type: DaemonSet
+network:
+  host_namespace: true
+EOF
+helm upgrade --install ingress-kube-system ./ingress \
   --namespace=kube-system \
-  --name=ingress-kube-system \
-  --set deployment.mode=cluster \
-  --set deployment.type=DaemonSet \
-  --set network.host_namespace=true \
-  --set network.vip.manage=false \
-  --set network.vip.addr=172.18.0.1/32 \
-  --set conf.services.udp.53='kube-system/kube-dns:53'
+  --values=/tmp/ingress-kube-system.yaml
 
 #NOTE: Deploy namespace ingress
-helm install ./ingress \
-  --namespace=openstack \
-  --name=ingress-openstack
+helm upgrade --install ingress-openstack ./ingress \
+  --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
diff --git a/tools/deployment/developer/common/050-mariadb.sh b/tools/deployment/developer/common/050-mariadb.sh
index f536915a5e..534aa4d1c2 100755
--- a/tools/deployment/developer/common/050-mariadb.sh
+++ b/tools/deployment/developer/common/050-mariadb.sh
@@ -20,9 +20,8 @@ set -xe
 make pull-images mariadb
 
 #NOTE: Deploy command
-helm install ./mariadb \
+helm upgrade --install mariadb ./mariadb \
     --namespace=openstack \
-    --name=mariadb \
     --set pod.replicas.server=1
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index bbc38f596a..d92c79d332 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -20,9 +20,8 @@ set -xe
 make pull-images rabbitmq
 
 #NOTE: Deploy command
-helm install ./rabbitmq \
+helm upgrade --install rabbitmq ./rabbitmq \
     --namespace=openstack \
-    --name=rabbitmq \
     --set pod.replicas.server=1
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/common/080-keystone.sh b/tools/deployment/developer/common/080-keystone.sh
index e23c6d0410..179e7d6261 100755
--- a/tools/deployment/developer/common/080-keystone.sh
+++ b/tools/deployment/developer/common/080-keystone.sh
@@ -20,9 +20,8 @@ set -xe
 make pull-images keystone
 
 #NOTE: Deploy command
-helm install ./keystone \
-    --namespace=openstack \
-    --name=keystone
+helm upgrade --install keystone ./keystone \
+    --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/090-heat.sh b/tools/deployment/developer/common/090-heat.sh
index 073ecf5b61..fb5ca67d15 100755
--- a/tools/deployment/developer/common/090-heat.sh
+++ b/tools/deployment/developer/common/090-heat.sh
@@ -19,9 +19,8 @@ set -xe
 make pull-images heat
 
 #NOTE: Deploy command
-helm install ./heat \
-  --namespace=openstack \
-  --name=heat
+helm upgrade --install heat ./heat \
+  --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index 74870587f8..68454aecfa 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -20,9 +20,8 @@ set -xe
 make pull-images horizon
 
 #NOTE: Deploy command
-helm install ./horizon \
+helm upgrade --install horizon ./horizon \
     --namespace=openstack \
-    --name=horizon \
     --set network.node_port.enabled=true \
     --set network.node_port.port=31000
 
diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh
index db451b9075..0921815219 100755
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -19,9 +19,8 @@ set -xe
 make pull-images openvswitch
 
 #NOTE: Deploy command
-helm install ./openvswitch \
-  --namespace=openstack \
-  --name=openvswitch
+helm upgrade --install openvswitch ./openvswitch \
+  --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/nfs/040-nfs-provisioner.sh b/tools/deployment/developer/nfs/040-nfs-provisioner.sh
index 86b97bad9a..9ab54fd32b 100755
--- a/tools/deployment/developer/nfs/040-nfs-provisioner.sh
+++ b/tools/deployment/developer/nfs/040-nfs-provisioner.sh
@@ -18,9 +18,8 @@ set -xe
 
 #NOTE: Deploy command
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-helm install ${OSH_INFRA_PATH}/nfs-provisioner \
+helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
     --namespace=nfs \
-    --name=nfs-provisioner \
     --set storageclass.name=general
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index 571645b530..dad43177d3 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -20,9 +20,8 @@ set -xe
 make pull-images glance
 
 #NOTE: Deploy command
-helm install ./glance \
+helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --name=glance \
   --set storage=pvc
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh
index a0e126ad5b..0b12cf8ecf 100755
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -19,9 +19,8 @@ set -xe
 make pull-images libvirt
 
 #NOTE: Deploy command
-helm install ./libvirt \
+helm upgrade --install libvirt ./libvirt \
   --namespace=openstack \
-  --name=libvirt \
   --set ceph.enabled=false
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh
index 47a10833fc..81a8b83aee 100755
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -22,17 +22,15 @@ make pull-images neutron
 #NOTE: Deploy nova
 if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
-  helm install ./nova \
+  helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --name=nova \
       --set ceph.enabled=false
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
-  helm install ./nova \
+  helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --name=nova \
-      --set conf.nova.libvirt.virt_type=qemu \
-      --set ceph.enabled=false
+      --set ceph.enabled=false \
+      --set conf.nova.libvirt.virt_type=qemu
 fi
 
 #NOTE: Deploy neutron
@@ -58,9 +56,8 @@ conf:
       ovs:
         bridge_mappings: public:br-ex
 EOF
-helm install ./neutron \
+helm upgrade --install neutron ./neutron \
     --namespace=openstack \
-    --name=neutron \
     --values=/tmp/neutron.yaml
 
 #NOTE: Wait for deploy