summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-15 18:21:14 +0000
committerGerrit Code Review <review@openstack.org>2016-11-15 18:21:14 +0000
commit6661cefcc4ce560318b2b4403f6fafbabf8e1853 (patch)
tree88df70292e80b38c4e4c2c448ce2dd9b9711f5ef
parentd7f4f3efbf97a96da303a503884a35b5a2ef723e (diff)
parent6e78c2f19afbaf513e6f8d936aed76daedadb947 (diff)
Merge " Enable TLS in the internal network for Barbican API"
-rw-r--r--manifests/haproxy.pp3
-rw-r--r--manifests/profile/base/barbican/api.pp57
2 files changed, 56 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index e0a8de8..2cd69c5 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -972,7 +972,8 @@ class tripleo::haproxy (
ip_addresses => hiera('barbican_api_node_ips', $controller_hosts_real),
server_names => hiera('barbican_api_node_names', $controller_hosts_names_real),
public_ssl_port => $ports[barbican_api_ssl_port],
- service_network => $barbican_network
+ service_network => $barbican_network,
+ member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index 470e649..b464317 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -18,18 +18,51 @@
#
# === Parameters
#
+# [*barbican_network*]
+# (Optional) The network name where the barbican endpoint is listening on.
+# This is set by t-h-t.
+# Defaults to hiera('barbican_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).
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::barbican::api (
- $bootstrap_node = hiera('bootstrap_nodeid', undef),
- $step = hiera('step'),
+ $barbican_network = hiera('barbican_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),
+ $step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@@ -37,6 +70,21 @@ class tripleo::profile::base::barbican::api (
$sync_db = false
}
+ if $enable_internal_tls {
+ if $generate_service_certificates {
+ ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
+ }
+
+ if !$barbican_network {
+ fail('barbican_api_network is not set in the hieradata.')
+ }
+ $tls_certfile = $certificates_specs["httpd-${barbican_network}"]['service_certificate']
+ $tls_keyfile = $certificates_specs["httpd-${barbican_network}"]['service_key']
+ } else {
+ $tls_certfile = undef
+ $tls_keyfile = undef
+ }
+
include ::tripleo::profile::base::barbican
if $step >= 3 and $sync_db {
@@ -51,6 +99,9 @@ class tripleo::profile::base::barbican::api (
include ::barbican::api::logging
include ::barbican::keystone::notification
include ::barbican::quota
- include ::barbican::wsgi::apache
+ class { '::barbican::wsgi::apache':
+ ssl_cert => $tls_certfile,
+ ssl_key => $tls_keyfile,
+ }
}
}