summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-08 16:19:48 +0000
committerGerrit Code Review <review@openstack.org>2016-11-08 16:19:48 +0000
commitc326036cfc3945a410d1f16d005d1b84f28ac83a (patch)
tree8f26240feb88fcb2c91eb65e1877911a4c2da96e
parent4d6b55c699baced5a64476be1a4ca9dba11f8a6b (diff)
parent9f9a6db9fc479355ee67ec45f170b77de56a1bdb (diff)
Merge "Enable TLS in the internal network for gnocchi"
-rw-r--r--manifests/haproxy.pp1
-rw-r--r--manifests/profile/base/gnocchi/api.pp59
2 files changed, 56 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 99c9205..644f1fd 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -966,6 +966,7 @@ class tripleo::haproxy (
server_names => hiera('gnocchi_api_node_names', $controller_hosts_names_real),
public_ssl_port => $ports[gnocchi_api_ssl_port],
service_network => $gnocchi_network,
+ member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 9a08551..2fde1fc 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -22,19 +22,52 @@
# (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).
+#
# [*gnocchi_backend*]
# (Optional) Gnocchi backend string file, swift or rbd
# Defaults to swift
#
+# [*gnocchi_network*]
+# (Optional) The network name where the gnocchi endpoint is listening on.
+# This is set by t-h-t.
+# Defaults to hiera('gnocchi_api_network', undef)
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::gnocchi::api (
- $bootstrap_node = hiera('bootstrap_nodeid', undef),
- $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
- $step = hiera('step'),
+ $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),
+ $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
+ $gnocchi_network = hiera('gnocchi_api_network', undef),
+ $step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@@ -44,13 +77,31 @@ class tripleo::profile::base::gnocchi::api (
include ::tripleo::profile::base::gnocchi
+ if $enable_internal_tls {
+ if $generate_service_certificates {
+ ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
+ }
+
+ if !$gnocchi_network {
+ fail('gnocchi_api_network is not set in the hieradata.')
+ }
+ $tls_certfile = $certificates_specs["httpd-${gnocchi_network}"]['service_certificate']
+ $tls_keyfile = $certificates_specs["httpd-${gnocchi_network}"]['service_key']
+ } else {
+ $tls_certfile = undef
+ $tls_keyfile = undef
+ }
+
if $step >= 3 and $sync_db {
include ::gnocchi::db::sync
}
if $step >= 4 {
include ::gnocchi::api
- include ::gnocchi::wsgi::apache
+ class { '::gnocchi::wsgi::apache':
+ ssl_cert => $tls_certfile,
+ ssl_key => $tls_keyfile,
+ }
class { '::gnocchi::storage':
coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),