openstack/openstack-helm
Code Issues Proposed changes

Parameterize charts for NFS in gate

Browse Source 
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
This commit is contained in:
Matt McEuen 2017-10-02 08:23:27 -05:00 committed by Matt McEuen
parent e67d9e5383
commit 7bb6b8b3d1
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/gate/README.rst
View File

@ -63,6 +63,7 @@ Linux Kernels >=4.10:
.. code:: bash .. code:: bash
export PVC_BACKEND=nfs export PVC_BACKEND=nfs
export GLANCE=pvc
It is also possible to customise the CNI used in the deployment: It is also possible to customise the CNI used in the deployment:

46
tools/gate/launch-osh/basic.sh
View File

@ -147,7 +147,13 @@ helm install --namespace=openstack ${WORK_DIR}/glance --name=glance \
--set storage=${GLANCE} --set storage=${GLANCE}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK} 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 if [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/openvswitch --name=openvswitch helm install --namespace=openstack ${WORK_DIR}/openvswitch --name=openvswitch
fi fi
@ -162,34 +168,24 @@ if [ "x$INTEGRATION" == "xmulti" ] || [ "x$RALLY_CHART_ENABLED" == "xtrue" ]; th
fi fi
fi fi
if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then NOVA_INSTALL="helm install --namespace=openstack ${WORK_DIR}/nova --name=nova\
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ --set conf.nova.libvirt.virt_type=qemu"
--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 \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then elif [ "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
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
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
fi fi