openstack/tripleo-heat-templates
Code Issues Proposed changes

Move selinux to deployment folder

Browse Source 
Change-Id: Ieda56421b27e54787fffbc39f8470a67aca38c1d
Related-Blueprint: services-yaml-flattening
This commit is contained in:
Alex Schultz 2019-01-22 12:30:35 -07:00
parent b08a44064f
commit a0400c998c
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/selinux.yaml → deployment/selinux/selinux-baremetal-puppet.yaml
View File

2
environments/standalone.yaml
View File

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

2
environments/standalone/standalone-overcloud.yaml
View File

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

2
environments/standalone/standalone-tripleo.yaml
View File

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

2
environments/undercloud.yaml
View File

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

4
sample-env-generator/standalone.yaml
View File

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