diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index 55cf565ef3..edd781248d 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: devices: @@ -110,6 +111,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 2dec03a377..54f6fd303d 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -31,7 +31,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"}