openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Emilien Macchi 2019-03-04 19:30:29 -05:00
parent bb1a9ea628
commit ce23ccf532
12 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/multinode-3nodes-registry.yaml
View File

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

2
ci/environments/scenario000-multinode-containers.yaml
View File

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

2
ci/environments/scenario001-multinode-containers.yaml
View File

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

2
ci/environments/scenario002-multinode-containers.yaml
View File

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

2
ci/environments/scenario003-multinode-containers.yaml
View File

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

2
ci/environments/scenario004-multinode-containers.yaml
View File

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

2
ci/environments/scenario004-standalone.yaml
View File

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

2
ci/environments/scenario006-multinode-containers.yaml
View File

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

2
ci/environments/scenario007-multinode-containers.yaml
View File

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

2
ci/environments/scenario010-multinode-containers.yaml
View File

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

2
ci/environments/scenario012-multinode-containers.yaml
View File

@ -80,3 +80,5 @@ parameter_defaults:
NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399' 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"}} 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' NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
# Remove ContainerCli once this scenario is tested on CentOS8
ContainerCli: docker

2
ci/environments/scenario012-standalone.yaml
View File

@ -38,3 +38,5 @@ parameter_defaults:
NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399' 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"}} 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' NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
# Remove ContainerCli once this scenario is tested on CentOS8
ContainerCli: docker