From 50f6aa18843388ffc79eb82ccd652bcd32d2a644 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 4 Jan 2018 10:18:22 +0200
Subject: [PATCH] Include security_compliance manifest in keystone

This enables us to configure the security compliance options through
t-h-t.

Depends-On: Ic4d962910343ad30de7840124bbc7773ea3697a1
Change-Id: I089f2e28cce2688ed080096c88ab539393627cfb
---
 manifests/profile/base/keystone.pp                           | 1 +
 releasenotes/notes/security-compliance-1f5cb3b3be9f7657.yaml | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/security-compliance-1f5cb3b3be9f7657.yaml

diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index efc229c6a..8f8e25aea 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -230,6 +230,7 @@ class tripleo::profile::base::keystone (
       ssl_key_admin  => $tls_keyfile_admin,
     }
     include ::keystone::cors
+    include ::keystone::security_compliance
 
     if $ldap_backend_enable {
       validate_hash($ldap_backends_config)
diff --git a/releasenotes/notes/security-compliance-1f5cb3b3be9f7657.yaml b/releasenotes/notes/security-compliance-1f5cb3b3be9f7657.yaml
new file mode 100644
index 000000000..05ad7761e
--- /dev/null
+++ b/releasenotes/notes/security-compliance-1f5cb3b3be9f7657.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The security compliance manifest was included in the keystone profile. This
+    enables us to configure the security compliance options through t-h-t.