aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/keystone.pp
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-07-13 12:27:23 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-10-19 17:37:32 +0300
commit76bf2f532f9541eaf9cd7242ad2bf520f6788033 (patch)
treea324b63a3e9de8e21ecc0c0e7b5368b1be726d19 /manifests/profile/base/keystone.pp
parente86706f0f6c589ed8baeb9616b128a738b330a94 (diff)
Enable TLS in the internal network for keystone
This optionally enables TLS for keystone in the internal network. If internal TLS is enabled, each node that is serving the keystone service will use certmonger to request its certificate. This, in turn should also configure a command that should be ran when the certificate is refreshed (which requires the service to be restarted). bp tls-via-certmonger Change-Id: I303f6cf47859284785c0cdc65284a7eb89a4e039
Diffstat (limited to 'manifests/profile/base/keystone.pp')
-rw-r--r--manifests/profile/base/keystone.pp90
1 files changed, 79 insertions, 11 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index fbccdda..a0e5538 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -18,18 +18,48 @@
#
# === Parameters
#
+# [*admin_endpoint_network*]
+# (Optional) The network name where the admin endpoint is listening on.
+# This is set by t-h-t.
+# Defaults to hiera('keystone_admin_api_network', undef)
+#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
+# [*certificates_specs*]
+# (Optional) The specifications to give to certmonger for the certificate(s)
+# it will create.
+# Example with hiera:
+# apache_certificates_specs:
+# httpd-internal_api:
+# hostname: <overcloud controller fqdn>
+# service_certificate: <service certificate path>
+# service_key: <service key path>
+# principal: "haproxy/<overcloud controller fqdn>"
+# Defaults to hiera('apache_certificate_specs', {}).
+#
+# [*enable_internal_tls*]
+# (Optional) Whether TLS in the internal network is enabled or not.
+# Defaults to hiera('enable_internal_tls', false)
+#
+# [*generate_service_certificates*]
+# (Optional) Whether or not certmonger will generate certificates for
+# HAProxy. This could be as many as specified by the $certificates_specs
+# variable.
+# Note that this doesn't configure the certificates in haproxy, it merely
+# creates the certificates.
+# Defaults to hiera('generate_service_certificate', false).
+#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
#
-# [*step*]
-# (Optional) The current step in deployment. See tripleo-heat-templates
-# for more details.
-# Defaults to hiera('step')
+# [*public_endpoint_network*]
+# (Optional) The network name where the admin endpoint is listening on.
+# This is set by t-h-t.
+# Defaults to hiera('keystone_public_api_network', undef)
+#
#
# [*rabbit_hosts*]
# list of the rabbbit host IPs
@@ -38,13 +68,23 @@
# [*rabbit_port*]
# IP port for rabbitmq service
# Defaults to hiera('keystone::rabbit_port', 5672)
-
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
class tripleo::profile::base::keystone (
- $bootstrap_node = hiera('bootstrap_nodeid', undef),
- $manage_db_purge = hiera('keystone_enable_db_purge', true),
- $step = hiera('step'),
- $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
- $rabbit_port = hiera('keystone::rabbit_port', 5672),
+ $admin_endpoint_network = hiera('keystone_admin_api_network', undef),
+ $bootstrap_node = hiera('bootstrap_nodeid', undef),
+ $certificates_specs = hiera('apache_certificates_specs', {}),
+ $enable_internal_tls = hiera('enable_internal_tls', false),
+ $generate_service_certificates = hiera('generate_service_certificates', false),
+ $manage_db_purge = hiera('keystone_enable_db_purge', true),
+ $public_endpoint_network = hiera('keystone_public_api_network', undef),
+ $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
+ $rabbit_port = hiera('keystone::rabbit_port', 5672),
+ $step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@@ -58,6 +98,29 @@ class tripleo::profile::base::keystone (
$manage_domain = false
}
+ if $enable_internal_tls {
+ if $generate_service_certificates {
+ ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
+ }
+
+ if !$public_endpoint_network {
+ fail('keystone_public_api_network is not set in the hieradata.')
+ }
+ $tls_certfile = $certificates_specs["httpd-${public_endpoint_network}"]['service_certificate']
+ $tls_keyfile = $certificates_specs["httpd-${public_endpoint_network}"]['service_key']
+
+ if !$admin_endpoint_network {
+ fail('keystone_admin_api_network is not set in the hieradata.')
+ }
+ $tls_certfile_admin = $certificates_specs["httpd-${admin_endpoint_network}"]['service_certificate']
+ $tls_keyfile_admin = $certificates_specs["httpd-${admin_endpoint_network}"]['service_key']
+ } else {
+ $tls_certfile = undef
+ $tls_keyfile = undef
+ $tls_certfile_admin = undef
+ $tls_keyfile_admin = undef
+ }
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
class { '::keystone':
sync_db => $sync_db,
@@ -66,7 +129,12 @@ class tripleo::profile::base::keystone (
}
include ::keystone::config
- include ::keystone::wsgi::apache
+ class { '::keystone::wsgi::apache':
+ ssl_cert => $tls_certfile,
+ ssl_key => $tls_keyfile,
+ ssl_cert_admin => $tls_certfile_admin,
+ ssl_key_admin => $tls_keyfile_admin,
+ }
include ::keystone::cors
if $manage_roles {