Merge "Enable TLS in the internal network for Cinder API"

2 files changed, 55 insertions, 3 deletions

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 4d96e98..5b69edd 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -809,6 +809,7 @@ class tripleo::haproxy (
       },
       public_ssl_port   => $ports[cinder_api_ssl_port],
       service_network   => $cinder_network,
+      member_options    => union($haproxy_member_options, $internal_tls_member_options),
     }
   }
 
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index 8fcc7d6..5ea2058 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -22,14 +22,47 @@
 #   (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', {}).
+#
+# [*cinder_api_network*]
+#   (Optional) The network name where the cinder API endpoint is listening on.
+#   This is set by t-h-t.
+#   Defaults to hiera('cinder_api_network', undef)
+#
+# [*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).
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::api (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $certificates_specs            = hiera('apache_certificates_specs', {}),
+  $cinder_api_network            = hiera('cinder_api_network', undef),
+  $enable_internal_tls           = hiera('enable_internal_tls', false),
+  $generate_service_certificates = hiera('generate_service_certificates', false),
+  $step                          = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -39,9 +72,27 @@ class tripleo::profile::base::cinder::api (
 
   include ::tripleo::profile::base::cinder
 
+  if $enable_internal_tls {
+    if $generate_service_certificates {
+      ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
+    }
+
+    if !$cinder_api_network {
+      fail('cinder_api_network is not set in the hieradata.')
+    }
+    $tls_certfile = $certificates_specs["httpd-${cinder_api_network}"]['service_certificate']
+    $tls_keyfile = $certificates_specs["httpd-${cinder_api_network}"]['service_key']
+  } else {
+    $tls_certfile = undef
+    $tls_keyfile = undef
+  }
+
   if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::cinder::api
-    include ::cinder::wsgi::apache
+    class { '::cinder::wsgi::apache':
+      ssl_cert => $tls_certfile,
+      ssl_key  => $tls_keyfile,
+    }
     include ::cinder::ceilometer
     include ::cinder::glance
   }