diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-04 11:30:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-04 11:30:47 +0000 |
| commit | 98eea44d5d91b74e1ab28c052e4fbc4b533d5f83 (patch) | |
| tree | db42264e722482d3eb9253a7598aea80f2ce7260 | |
| parent | 20ad7c2cd4d34869cde2af8fdc5fcd96b3a97fe0 (diff) | |
| parent | 3086937fd99669a5714fd974ed44fdd78930253a (diff) | |
| download | heat-98eea44d5d91b74e1ab28c052e4fbc4b533d5f83.tar.gz | |
Merge "Use no-op drivers for Octavia in gate" into stable/rocky
| -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 7894b8bcc..0427bc9a9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -27,7 +27,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 119f9e1db..9ca02952c 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/functional/run.yaml @@ -66,6 +66,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" services+=,octavia,o-cw,o-hk,o-hm,o-api export PROJECTS="openstack/octavia $PROJECTS" 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 |