openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow standalone to manage selinux"

Browse Source
This commit is contained in:
Zuul 2018-10-22 21:31:07 +00:00 committed by Gerrit Code Review
commit 440fd70277
6 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/standalone.yaml
View File

@ -6,6 +6,9 @@ resource_registry:
OS::TripleO::Standalone::Net::SoftwareConfig: ../net-config-standalone.yaml
OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/standalone_post.yaml
# Manage SELinux
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None
OS::TripleO::Services::Keepalived: OS::Heat::None

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

@ -94,6 +94,7 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None

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

@ -102,6 +102,7 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None

4
releasenotes/notes/standalone-selinux-configuration-39a0c7285d8e4c66.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
SELinux can be configured on the Standalone deployment by setting SELinuxMode.

1
roles/Standalone.yaml
View File

@ -157,6 +157,7 @@
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::SELinux
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::SkydiveAgent
- OS::TripleO::Services::SkydiveAnalyzer

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

@ -55,6 +55,9 @@ environments:
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
OS::TripleO::NodeExtraConfigPost: ../../extraconfig/post_deploy/standalone_post.yaml
# Manage SELinux
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None
OS::TripleO::Services::Keepalived: OS::Heat::None
@ -169,6 +172,9 @@ environments:
resource_registry:
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
# Manage SELinux
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::Kubernetes::Master: OS::Heat::None
OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None