Merge "Fix scenario glance backend for scenario010" into stable/rocky

ci/environments/scenario010-multinode-containers.yaml

@@ -63,12 +63,13 @@ 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
   SwiftCeilometerPipelineEnabled: false
+  GlanceBackend: 'file'
   NeutronServicePlugins: "qos,router,trunk"
   NeutronEnableForceMetadata: true
   OctaviaManageNovaFlavor: true
   # For now, we hardcode it but soon it'll be generated in tripleo-common
   OctaviaCaKeyPassphrase: 'upstreamci'
   OctaviaGenerateCerts: true
-

ci/environments/scenario010-standalone.yaml

@@ -31,7 +31,12 @@ 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
+  OctaviaCaKeyPassphrase: 'upstreamci'
+  OctaviaManageNovaFlavor: true
+  OctaviaGenerateCerts: true
   NodeDataLookup:
     AB4114B1-9C9D-409A-BEFB-D88C151BF2C3: {"foo": "bar"}
     8CF1A7EA-7B4B-4433-AC83-17675514B1B8: {"foo2": "bar2"}