Browse Source

Move podman into deployment directory

This changes moves podman service from puppet to deployment directory.

Change-Id: I31b8299b43158347f4f1f61f1e1fdf38b0a2102f
Related-Blueprint: services-yaml-flattening
changes/75/624175/6
Emilien Macchi 4 years ago
parent
commit
7fe1730a38
  1. 0
      deployment/podman/podman-baremetal-ansible.yaml
  2. 2
      environments/podman.yaml
  3. 2
      environments/standalone/standalone-tripleo.yaml
  4. 2
      environments/undercloud.yaml
  5. 2
      sample-env-generator/standalone.yaml

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

2
environments/podman.yaml

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save