From d7306bb95877e3f3246a6a69b7dea5adc5fb9a3a Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Mon, 8 Jul 2019 09:50:42 -0400
Subject: [PATCH] Configure amphora for upload and run tempest

Depends-On: I7f0bc4bfa3500f0ff582a151fdc7de44caa060db
Depends-On: Ie387f1274059ec80d19c5ef0bf9aed7a3a999e2a
Depends-On: I8be48a7bd07e0a00972b4bef268c4bd2badc6711
Change-Id: I2b2f067d51cd5e430c078acd62912859be195589
(cherry picked from commit 6359f1e37ba31242614efaf3ec0a03cecc5253b9)
---
 ci/environments/scenario010-multinode-containers.yaml | 2 ++
 ci/environments/scenario010-standalone.yaml           | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index aa0f5b3bca..e1f7291d4b 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -78,6 +78,7 @@ parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
+    octavia::controller::connection_retry_interval: 10
   Debug: true
   CephAnsibleDisksConfig:
     osd_objectstore: bluestore
@@ -115,6 +116,7 @@ parameter_defaults:
   GnocchiRbdPoolName: metrics
   SwiftCeilometerPipelineEnabled: false
   NeutronEnableForceMetadata: true
+  OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
   OctaviaManageNovaFlavor: true
   # For now, we hardcode it but soon it'll be generated in tripleo-common
   OctaviaCaKeyPassphrase: 'upstreamci'
diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml
index dcc2c856b9..12af30c87f 100644
--- a/ci/environments/scenario010-standalone.yaml
+++ b/ci/environments/scenario010-standalone.yaml
@@ -27,7 +27,13 @@ resource_registry:
   OS::TripleO::Services::Horizon: OS::Heat::None
 
 parameter_defaults:
+  StandaloneExtraConfig:
+    octavia::controller::connection_retry_interval: 10
   OctaviaAmphoraSshKeyFile: /home/zuul/.ssh/id_rsa.pub
+  OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
+  OctaviaCaKeyPassphrase: 'upstreamci'
+  OctaviaManageNovaFlavor: true
+  OctaviaGenerateCerts: true
   NodeDataLookup:
     AB4114B1-9C9D-409A-BEFB-D88C151BF2C3: {"foo": "bar"}
     8CF1A7EA-7B4B-4433-AC83-17675514B1B8: {"foo2": "bar2"}