diff --git a/environments/standalone.yaml b/environments/standalone.yaml index e02492cc34..6097e27765 100644 --- a/environments/standalone.yaml +++ b/environments/standalone.yaml @@ -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 diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index ab6bc01691..9e2b21fcb0 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -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 diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 99598ccbb4..08d368ef43 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -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 diff --git a/releasenotes/notes/standalone-selinux-configuration-39a0c7285d8e4c66.yaml b/releasenotes/notes/standalone-selinux-configuration-39a0c7285d8e4c66.yaml new file mode 100644 index 0000000000..6e7aa2311e --- /dev/null +++ b/releasenotes/notes/standalone-selinux-configuration-39a0c7285d8e4c66.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + SELinux can be configured on the Standalone deployment by setting SELinuxMode. diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index ecd1cc0f58..840c980e08 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -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 diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index 54748eb7c3..a180b1c69e 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -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