From 7fe1730a3857bec794105dc95e0afea5f66c0707 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 10 Dec 2018 14:12:55 -0500
Subject: [PATCH] Move podman into deployment directory
This changes moves podman service from puppet to deployment directory.
Change-Id: I31b8299b43158347f4f1f61f1e1fdf38b0a2102f
Related-Blueprint: services-yaml-flattening
---
.../podman/podman-baremetal-ansible.yaml | 0
environments/podman.yaml | 2 +-
environments/standalone/standalone-tripleo.yaml | 2 +-
environments/undercloud.yaml | 2 +-
sample-env-generator/standalone.yaml | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename puppet/services/podman.yaml => deployment/podman/podman-baremetal-ansible.yaml (100%)
diff --git a/puppet/services/podman.yaml b/deployment/podman/podman-baremetal-ansible.yaml
similarity index 100%
rename from puppet/services/podman.yaml
rename to deployment/podman/podman-baremetal-ansible.yaml
diff --git a/environments/podman.yaml b/environments/podman.yaml
index 2f3cbdb431..2bb40bd877 100644
--- a/environments/podman.yaml
+++ b/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
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index 0b4c1842a9..00ba7d8420 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/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
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index c644ad0fd3..0d4e307576 100644
--- a/environments/undercloud.yaml
+++ b/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
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index bc99b79322..ae5ac177e1 100644
--- a/sample-env-generator/standalone.yaml
+++ b/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