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:
parent
beb8ae7dd5
commit
7fe1730a38
|
@ -1,6 +1,6 @@
|
||||||
# Environment that enables Podman.
|
# Environment that enables Podman.
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::Podman: ../puppet/services/podman.yaml
|
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
MistralDockerGroup: false
|
MistralDockerGroup: false
|
||||||
|
|
|
@ -109,7 +109,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::MistralExecutor: OS::Heat::None
|
OS::TripleO::Services::MistralExecutor: OS::Heat::None
|
||||||
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
|
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
|
||||||
OS::TripleO::Services::PankoApi: OS::Heat::None
|
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::SELinux: ../../puppet/services/selinux.yaml
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
|
|
|
@ -31,7 +31,7 @@ resource_registry:
|
||||||
|
|
||||||
# Enable Podman on the Undercloud.
|
# Enable Podman on the Undercloud.
|
||||||
# This line will drop in Stein when it becomes the default.
|
# 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
|
# Undercloud HA services
|
||||||
OS::TripleO::Services::HAproxy: OS::Heat::None
|
OS::TripleO::Services::HAproxy: OS::Heat::None
|
||||||
|
|
|
@ -66,7 +66,7 @@ environments:
|
||||||
# Activate container image prepare
|
# Activate container image prepare
|
||||||
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
|
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
|
||||||
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.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
|
# Disable non-openstack services that are enabled by default
|
||||||
OS::TripleO::Services::HAproxy: OS::Heat::None
|
OS::TripleO::Services::HAproxy: OS::Heat::None
|
||||||
|
|
Loading…
Reference in New Issue