From 353c1936009c74d0f875c285c45a086e5f23a124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Thu, 26 Oct 2017 11:48:47 +0200 Subject: [PATCH] Fix mistakes in tempest playbook There were two mistakes in tempest playbook causing LBaaS v2 and Octavia jobs to fail: * if clause in bash requires usage of [ ] syntax to get the comparisons to work. * $PROJECTS additions cannot be defined in local.conf. This commit fixes both. Change-Id: I7eda3b5e263565b8845ffeaa480f406a3a3f0731 Closes-Bug: 1727668 --- playbooks/tempest-kuryr-kubernetes-base/run.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/playbooks/tempest-kuryr-kubernetes-base/run.yaml b/playbooks/tempest-kuryr-kubernetes-base/run.yaml index 8d5f830c8..fdde4eab3 100644 --- a/playbooks/tempest-kuryr-kubernetes-base/run.yaml +++ b/playbooks/tempest-kuryr-kubernetes-base/run.yaml @@ -75,18 +75,14 @@ ENABLED_SERVICES+=,q-lbaasv2 enable_plugin neutron-lbaas git://git.openstack.org/openstack/neutron-lbaas - if "{{ loadbalancer }}" == "lbaasv2"; then + if [ "{{ loadbalancer }}" == "lbaasv2" ]; then # Haproxy agent NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default - elif "{{ loadbalancer }}" == "octavia"; then + elif [ "{{ loadbalancer }}" == "octavia" ]; then # Octavia enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin barbican https://git.openstack.org/openstack/barbican ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hk,o-hm - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - export PROJECTS="openstack/python-octaviaclient $PROJECTS" fi # Enable Tempest @@ -117,6 +113,13 @@ export PROJECTS="openstack/kuryr-tempest-plugin $PROJECTS" export PROJECTS="openstack/devstack-plugin-container $PROJECTS" + if [ "{{ loadbalancer }}" == "octavia" ]; then + export PROJECTS="openstack/barbican $PROJECTS" + export PROJECTS="openstack/python-barbicanclient $PROJECTS" + export PROJECTS="openstack/octavia $PROJECTS" + export PROJECTS="openstack/python-octaviaclient $PROJECTS" + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash