Merge "Move podman into deployment directory"

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

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

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

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