From a0400c998c6c98880b12fd00d7d8b47dafb5e8ce Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 22 Jan 2019 12:30:35 -0700
Subject: [PATCH] Move selinux to deployment folder
Change-Id: Ieda56421b27e54787fffbc39f8470a67aca38c1d
Related-Blueprint: services-yaml-flattening
---
.../selinux/selinux-baremetal-puppet.yaml | 0
environments/standalone.yaml | 2 +-
environments/standalone/standalone-overcloud.yaml | 2 +-
environments/standalone/standalone-tripleo.yaml | 2 +-
environments/undercloud.yaml | 2 +-
sample-env-generator/standalone.yaml | 4 ++--
6 files changed, 6 insertions(+), 6 deletions(-)
rename puppet/services/selinux.yaml => deployment/selinux/selinux-baremetal-puppet.yaml (100%)
diff --git a/puppet/services/selinux.yaml b/deployment/selinux/selinux-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/selinux.yaml
rename to deployment/selinux/selinux-baremetal-puppet.yaml
diff --git a/environments/standalone.yaml b/environments/standalone.yaml
index d16dd06c9f..3a8bbd22c8 100644
--- a/environments/standalone.yaml
+++ b/environments/standalone.yaml
@@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/standalone_post.yaml
# Manage SELinux
- OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml
# Disable non-openstack services that are enabled by default
diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml
index 926e304f1b..501e8e5d96 100644
--- a/environments/standalone/standalone-overcloud.yaml
+++ b/environments/standalone/standalone-overcloud.yaml
@@ -95,7 +95,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::SELinux: ../../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index 8b32d4b32e..6202381a3a 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -115,7 +115,7 @@ resource_registry:
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::Redis: OS::Heat::None
- OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 8cae712542..be5cc1a356 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -9,7 +9,7 @@ resource_registry:
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml
# We managed this in instack-undercloud, so we need to manage it here.
- OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml
# services we disable by default on the undercloud
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index c3a1a8f4a1..4a85e8e83f 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -63,7 +63,7 @@ environments:
OS::TripleO::NodeExtraConfigPost: ../../extraconfig/post_deploy/standalone_post.yaml
# Manage SELinux
- OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
@@ -189,7 +189,7 @@ environments:
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
# Manage SELinux
- OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
+ OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml