From 19a938cffa5944b2a58c7b51d5f5e648d1306085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Tue, 20 Aug 2019 17:17:22 +0200
Subject: [PATCH] Remove downloading amphora image

We started using pre-built amphora images to speed up deployment
process. The problem with that approach is that only master images are
getting pre-built. This commit removes using master's amphora from a
stable branch and falls back to good, old diskimage-builder.

Change-Id: Ie10b1e37811e05c1137400ebdb9028cdafd2e88c
---
 .zuul.d/octavia.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml
index fb358f90a..6a360878e 100644
--- a/.zuul.d/octavia.yaml
+++ b/.zuul.d/octavia.yaml
@@ -22,7 +22,6 @@
       - openstack/octavia
       - openstack/python-barbicanclient
       - openstack/python-octaviaclient
-    pre-run: playbooks/get_amphora_tarball.yaml
     host-vars:
       controller:
         devstack_plugins:
@@ -30,7 +29,6 @@
           barbican: https://opendev.org/openstack/barbican
     vars:
       devstack_localrc:
-        OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
         OCTAVIA_AMP_IMAGE_SIZE: 3
         OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-xenial"
       devstack_local_conf: