diff options
| author | Zane Bitter <zbitter@redhat.com> | 2018-09-13 10:47:22 -0600 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2019-08-04 20:40:01 +0530 |
| commit | 58b3325c7d19d570cd286743f9991754278d8c0f (patch) | |
| tree | 4c9b1f231d154a9c614501b1b07850227661dc62 | |
| parent | 3735796c20430f8a1be1e66929f130bb43c8d617 (diff) | |
| download | heat-58b3325c7d19d570cd286743f9991754278d8c0f.tar.gz | |
Use no-op drivers for Octavia in gate
Continue to test Heat's interaction with the Octavia API without relying on
Octavia's interaction with Nova, Neutron &c. which is known to be unstable.
Change-Id: I8765aceee09ada3086abc704b7f73ce240e21847
(cherry picked from commit 866864f7e5973053edcd9de59caab05790729964
and 82e30159b59d719b1654c7f138f4e52fe8fee1c6)
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | playbooks/devstack/functional/run.yaml | 4 | ||||
| -rw-r--r-- | playbooks/get_amphora_tarball.yaml | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index b011279bf..9daeab6b8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -28,7 +28,6 @@ - ^heat/locale/.*$ - ^heat/tests/.*$ - ^releasenotes/.*$ - pre-run: playbooks/get_amphora_tarball.yaml vars: disable_convergence: 'false' sql: mysql diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index 98989b030..4e4b490c2 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/functional/run.yaml @@ -69,6 +69,10 @@ 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" # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api export PROJECTS="openstack/barbican $PROJECTS" diff --git a/playbooks/get_amphora_tarball.yaml b/playbooks/get_amphora_tarball.yaml deleted file mode 100644 index 9da0826dc..000000000 --- a/playbooks/get_amphora_tarball.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: primary - tasks: - - name: Download amphora tarball - get_url: - url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2" - dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 |