From 7d397278b32418a1a0334e92712fbd7774d5862d Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Wed, 30 Jan 2019 09:35:04 -0800 Subject: [PATCH] [CI] Drop redundant if condition in the LVM job playbook Was left over from a JJB template --> ZuulV3 conversion. TrivialFix Change-Id: I0bfdf91dfec397c0fd81e18a29f97ff4c0183205 --- .../manila-tempest-minimal-dsvm-lvm/run.yaml | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index cf366ea0ec..527f750806 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -52,18 +52,16 @@ # Basic services needed for minimal job OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - if [ "lvm" == "lvm" ]; then - # Enable glance for scenario tests - OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg - # Enable nova for scenario tests - OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj - # Enable neutron for scenario tests - OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt + # Enable glance for scenario tests + OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg + # Enable nova for scenario tests + OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj + # Enable neutron for scenario tests + OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt - # Enable mandatory placement services for nova starting with ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client - fi + # Enable mandatory placement services for nova starting with ocata + if [[ "stable/newton" != $ZUUL_BRANCH ]]; then + OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client fi export OVERRIDE_ENABLED_SERVICES