openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move podman into deployment directory 

This changes moves podman service from puppet to deployment directory.

Change-Id: I31b8299b43158347f4f1f61f1e1fdf38b0a2102f
Related-Blueprint: services-yaml-flattening
This commit is contained in:
Emilien Macchi 2018-12-10 14:12:55 -05:00
parent beb8ae7dd5
commit 7fe1730a38
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/podman.yaml → deployment/podman/podman-baremetal-ansible.yaml
View File

2
environments/podman.yaml
View File

@ -1,6 +1,6 @@
# Environment that enables Podman.
resource_registry:
OS::TripleO::Services::Podman: ../puppet/services/podman.yaml
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
parameter_defaults:
MistralDockerGroup: false

2
environments/standalone/standalone-tripleo.yaml
View File

@ -109,7 +109,7 @@ resource_registry:
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::Podman: ../../puppet/services/podman.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None

2
environments/undercloud.yaml
View File

@ -31,7 +31,7 @@ resource_registry:
# Enable Podman on the Undercloud.
# This line will drop in Stein when it becomes the default.
OS::TripleO::Services::Podman: ../puppet/services/podman.yaml
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
# Undercloud HA services
OS::TripleO::Services::HAproxy: OS::Heat::None

2
sample-env-generator/standalone.yaml
View File

@ -66,7 +66,7 @@ environments:
# Activate container image prepare
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
OS::TripleO::Services::Podman: ../../puppet/services/podman.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None