Merge "Use no-op drivers for Octavia in gate" into stable/queens
This commit is contained in:
commit
fedcbb84bf
|
@ -28,7 +28,6 @@
|
||||||
- ^heat/locale/.*$
|
- ^heat/locale/.*$
|
||||||
- ^heat/tests/.*$
|
- ^heat/tests/.*$
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
pre-run: playbooks/get_amphora_tarball.yaml
|
|
||||||
vars:
|
vars:
|
||||||
disable_convergence: 'false'
|
disable_convergence: 'false'
|
||||||
sql: mysql
|
sql: mysql
|
||||||
|
|
|
@ -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_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_SIZE=3"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
|
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
|
# enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
|
||||||
services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
|
services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
|
||||||
export PROJECTS="openstack/barbican $PROJECTS"
|
export PROJECTS="openstack/barbican $PROJECTS"
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue