openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Make sure ContainerCli is set to the stack 

ContainerCli has been used everwhere now to differentiate a deployment
on Docker and on Podman. The parameter needs to be in the stack anyway,
so let's have it in overcloud-resource-registry-puppet.

Note: default to Podman, except when Pacemaker is deployed where we
don't support Podman yet on CentOS7. It will change with CentOS8.

Change-Id: I02aa484cabfb851f80ddd90ddefdfe2d5cfbb573
Closes-Bug: #1819449
This commit is contained in:
Emilien Macchi 2019-03-11 08:31:59 -04:00
parent 1adc6ab8bd
commit c180847b8e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/docker-ha.yaml
View File

@ -21,3 +21,6 @@ resource_registry:
OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::Redis: ../deployment/database/redis-pacemaker-puppet.yaml
parameter_defaults:
ContainerCli: docker

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -360,6 +360,7 @@ resource_registry:
parameter_defaults:
NeutronMechanismDrivers: ovn
ContainerCli: podman
EnablePackageInstall: false
SoftwareConfigTransport: POLL_TEMP_URL