From 82e30159b59d719b1654c7f138f4e52fe8fee1c6 Mon Sep 17 00:00:00 2001 From: rabi Date: Tue, 25 Sep 2018 11:34:04 +0530 Subject: [PATCH] Set the octavia noop drivers correctly In 866864f7e5973053edcd9de59caab05790729964 we changed to use noop drivers, we don't seem to set them correctly. Depends-On: https://review.openstack.org/605000 Change-Id: I7ba69fc047334c9c3d2fffe41e586650f9fb372b --- playbooks/devstack/functional/run.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index 1e396b5c09..9ca02952c6 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/functional/run.yaml @@ -66,11 +66,12 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMPHORA_DRIVER=amphora_noop_driver" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_COMPUTE_DRIVER=compute_noop_driver" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_NETWORK_DRIVER=network_noop_driver" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DISABLE_AMP_IMAGE_BUILD=True" services+=,octavia,o-cw,o-hk,o-hm,o-api export PROJECTS="openstack/octavia $PROJECTS" - export OCTAVIA_AMPHORA_DRIVER="amphora_noop_driver" - export OCTAVIA_COMPUTE_DRIVER="compute_noop_driver" - export OCTAVIA_NETWORK_DRIVER="network_noop_driver" export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"