Merge "CI: force ContainerCli to Docker when needed"

ci/environments/multinode-3nodes-registry.yaml

@@ -19,3 +19,5 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
   SwiftCeilometerPipelineEnabled: False
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario000-multinode-containers.yaml

@@ -39,3 +39,5 @@ parameter_defaults:
   Debug: true
   DockerPuppetDebug: True
   NotificationDriver: 'noop'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario001-multinode-containers.yaml

@@ -177,3 +177,5 @@ parameter_defaults:
     - tty4
     - tty5
     - tty6
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario002-multinode-containers.yaml

@@ -111,3 +111,5 @@ parameter_defaults:
   ZaqarManagementStore: 'sqlalchemy'
   SwiftCeilometerPipelineEnabled: false
   BarbicanSimpleCryptoGlobalDefault: true
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario003-multinode-containers.yaml

@@ -132,3 +132,5 @@ parameter_defaults:
             rndc_host: 192.168.24.251
             rndc_port: 953
             rndc_key_file: /etc/rndc.key
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario004-multinode-containers.yaml

@@ -131,3 +131,5 @@ parameter_defaults:
   # BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
   # L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
   NotificationDriver: 'noop'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario004-standalone.yaml

@@ -96,3 +96,5 @@ parameter_defaults:
     - tty4
     - tty5
     - tty6
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario006-multinode-containers.yaml

@@ -60,3 +60,5 @@ parameter_defaults:
   GlanceBackend: 'file'
   IronicCleaningDiskErase: 'metadata'
   NotificationDriver: 'noop'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario007-multinode-containers.yaml

@@ -106,3 +106,5 @@ parameter_defaults:
   GlanceBackend: 'file'
   IronicCleaningDiskErase: 'metadata'
   NotificationDriver: 'noop'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario010-multinode-containers.yaml

@@ -111,3 +111,5 @@ parameter_defaults:
   # For now, we hardcode it but soon it'll be generated in tripleo-common
   OctaviaCaKeyPassphrase: 'upstreamci'
   OctaviaGenerateCerts: true
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario012-multinode-containers.yaml

@@ -80,3 +80,5 @@ parameter_defaults:
   NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
   ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}
   NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker

ci/environments/scenario012-standalone.yaml

@@ -38,3 +38,5 @@ parameter_defaults:
   NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
   ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}
   NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
+  # Remove ContainerCli once this scenario is tested on CentOS8
+  ContainerCli: docker