From ce23ccf532c1c471c5d1fb675a71de9003ff5e95 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 4 Mar 2019 19:30:29 -0500 Subject: [PATCH] CI: force ContainerCli to Docker when needed For the CI scenarios which still run Pacemaker, let's force ContainerCli until we get them working with Podman. Change-Id: I8405a00c7e4686b1569f6e68e3c1507f1e11b3a3 --- ci/environments/multinode-3nodes-registry.yaml | 2 ++ ci/environments/scenario000-multinode-containers.yaml | 2 ++ ci/environments/scenario001-multinode-containers.yaml | 2 ++ ci/environments/scenario002-multinode-containers.yaml | 2 ++ ci/environments/scenario003-multinode-containers.yaml | 2 ++ ci/environments/scenario004-multinode-containers.yaml | 2 ++ ci/environments/scenario004-standalone.yaml | 2 ++ ci/environments/scenario006-multinode-containers.yaml | 2 ++ ci/environments/scenario007-multinode-containers.yaml | 2 ++ ci/environments/scenario010-multinode-containers.yaml | 2 ++ ci/environments/scenario012-multinode-containers.yaml | 2 ++ ci/environments/scenario012-standalone.yaml | 2 ++ 12 files changed, 24 insertions(+) diff --git a/ci/environments/multinode-3nodes-registry.yaml b/ci/environments/multinode-3nodes-registry.yaml index 9b0b051a41..2b5d462890 100644 --- a/ci/environments/multinode-3nodes-registry.yaml +++ b/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 diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 5f55660def..88c78e1a10 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 273a60070c..637b3fd502 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 66ed5a1023..880bcc3b3a 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index e29954b600..1d6ea01bd0 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 00f04a9589..33135be947 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 6cd98ae7be..7bd5ddd2c3 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/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 diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml index e367df7e0c..160de9510a 100644 --- a/ci/environments/scenario006-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index e38ff8f667..825570d244 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index 963ba77d12..889b15dbed 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario012-multinode-containers.yaml b/ci/environments/scenario012-multinode-containers.yaml index 3415999bf3..93ed44b397 100644 --- a/ci/environments/scenario012-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml index c663388b62..91afd3576f 100644 --- a/ci/environments/scenario012-standalone.yaml +++ b/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