summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml1
-rw-r--r--playbooks/devstack/functional/run.yaml3
-rw-r--r--playbooks/get_amphora_tarball.yaml6
3 files changed, 10 insertions, 0 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index bfe489487..a64c46ebd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -27,6 +27,7 @@
- ^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 626573707..82fd4b697 100644
--- a/playbooks/devstack/functional/run.yaml
+++ b/playbooks/devstack/functional/run.yaml
@@ -65,6 +65,9 @@
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"
+ 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"
# 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
new file mode 100644
index 000000000..9da0826dc
--- /dev/null
+++ b/playbooks/get_amphora_tarball.yaml
@@ -0,0 +1,6 @@
+- 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