From 7bb6b8b3d12fe4a93835ed34de566ab77aad9dd4 Mon Sep 17 00:00:00 2001
From: Matt McEuen <mm9745@att.com>
Date: Mon, 2 Oct 2017 08:23:27 -0500
Subject: [PATCH] Parameterize charts for NFS in gate

Added check to the gate script to appropriately tell the libvirt
and nova charts whether ceph is being used.  Also added a doc
update to tell Glance to use pvc rather than ceph.

Change-Id: Ic4fc29276a9c0379c43dda8f1788342c31dcf920
---
 tools/gate/README.rst          |  1 +
 tools/gate/launch-osh/basic.sh | 46 ++++++++++++++++------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/tools/gate/README.rst b/tools/gate/README.rst
index 9f655ff1b6..be156651b2 100644
--- a/tools/gate/README.rst
+++ b/tools/gate/README.rst
@@ -63,6 +63,7 @@ Linux Kernels >=4.10:
 .. code:: bash
 
     export PVC_BACKEND=nfs
+    export GLANCE=pvc
 
 It is also possible to customise the CNI used in the deployment:
 
diff --git a/tools/gate/launch-osh/basic.sh b/tools/gate/launch-osh/basic.sh
index 0e3e353a29..6005b7937e 100755
--- a/tools/gate/launch-osh/basic.sh
+++ b/tools/gate/launch-osh/basic.sh
@@ -147,7 +147,13 @@ helm install --namespace=openstack ${WORK_DIR}/glance --name=glance \
   --set storage=${GLANCE}
 kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
 
-helm install --namespace=openstack ${WORK_DIR}/libvirt --name=libvirt
+if [ "x${PVC_BACKEND}" == "xceph" ]; then
+    helm install --namespace=openstack ${WORK_DIR}/libvirt --name=libvirt
+else
+    helm install --namespace=openstack ${WORK_DIR}/libvirt --name=libvirt \
+        --set ceph.enabled="false"
+fi
+
 if [ "x$SDN_PLUGIN" == "xovs" ]; then
   helm install --namespace=openstack ${WORK_DIR}/openvswitch --name=openvswitch
 fi
@@ -162,34 +168,24 @@ if [ "x$INTEGRATION" == "xmulti" ] || [ "x$RALLY_CHART_ENABLED" == "xtrue" ]; th
   fi
 fi
 
-if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
-  helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
-      --set conf.nova.libvirt.virt_type=qemu
+NOVA_INSTALL="helm install --namespace=openstack ${WORK_DIR}/nova --name=nova\
+    --set conf.nova.libvirt.virt_type=qemu"
 
+if [ "x$PVC_BACKEND" == "x" ] || [ "x$PVC_BACKEND" == "xnfs" ]; then
+  NOVA_INSTALL+=" --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml"
+fi
+
+if [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
+  NOVA_INSTALL+=" --set dependencies.compute.daemonset={neutron-lb-agent}"
+fi
+
+$NOVA_INSTALL
+
+if [ "x$SDN_PLUGIN" == "xovs" ]; then
   helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
       --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
 
-elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
-  helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
-      --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
-      --set conf.nova.libvirt.virt_type=qemu
-
-  helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
-      --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
-
-elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
-  helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
-      --set dependencies.compute.daemonset={neutron-lb-agent} \
-      --set conf.nova.libvirt.virt_type=qemu
-
-  helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
-      --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
-
-elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
-  helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
-      --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
-      --set conf.nova.libvirt.virt_type=qemu
-
+elif [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
   helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
       --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
 fi