aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/haproxy.pp1
-rw-r--r--manifests/profile/base/aodh/api.pp58
-rw-r--r--manifests/profile/base/haproxy.pp2
-rw-r--r--manifests/profile/base/zaqar.pp19
4 files changed, 74 insertions, 6 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 2508dfb..5f563ba 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -918,6 +918,7 @@ class tripleo::haproxy (
server_names => hiera('aodh_api_node_names', $controller_hosts_names_real),
public_ssl_port => $ports[aodh_api_ssl_port],
service_network => $aodh_network,
+ member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 2dcf802..06dcfe5 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -18,6 +18,35 @@
#
# === Parameters
#
+# [*aodh_network*]
+# (Optional) The network name where the aodh endpoint is listening on.
+# This is set by t-h-t.
+# Defaults to hiera('aodh_api_network', undef)
+#
+# [*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.
@@ -29,15 +58,38 @@
#
class tripleo::profile::base::aodh::api (
- $step = hiera('step'),
- $enable_combination_alarms = false,
+ $aodh_network = hiera('aodh_api_network', 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'),
+ $enable_combination_alarms = false,
) {
include ::tripleo::profile::base::aodh
+ if $enable_internal_tls {
+ if $generate_service_certificates {
+ ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
+ }
+
+ if !$aodh_network {
+ fail('aodh_api_network is not set in the hieradata.')
+ }
+ $tls_certfile = $certificates_specs["httpd-${aodh_network}"]['service_certificate']
+ $tls_keyfile = $certificates_specs["httpd-${aodh_network}"]['service_key']
+ } else {
+ $tls_certfile = undef
+ $tls_keyfile = undef
+ }
+
+
if $step >= 4 {
include ::aodh::api
- include ::aodh::wsgi::apache
+ class { '::aodh::wsgi::apache':
+ ssl_cert => $tls_certfile,
+ ssl_key => $tls_keyfile,
+ }
#NOTE: Combination alarms are deprecated in newton and disabled by default.
# we need a way to override this setting for users still using this type
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index afeb8c0..f16ec1b 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -95,7 +95,7 @@ class tripleo::profile::base::haproxy (
command => 'systemctl reload haproxy',
path => ['/usr/bin', '/usr/sbin'],
refreshonly => true,
- onlyif => 'pcs property | grep -q "maintenance-mode.*true"',
+ onlyif => 'systemctl is-active haproxy | grep -q active',
subscribe => Class['::haproxy']
}
Haproxy::Listen<||> ~> Exec['haproxy-reload']
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index 6794742..89a03ad 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -32,8 +32,23 @@ class tripleo::profile::base::zaqar (
) {
if $step >= 4 {
include ::zaqar
- include ::zaqar::management::mongodb
- include ::zaqar::messaging::mongodb
+
+ if str2bool(hiera('mongodb::server::ipv6', false)) {
+ $mongo_node_ips_with_port_prefixed = prefix(hiera('mongodb_node_ips'), '[')
+ $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017')
+ } else {
+ $mongo_node_ips_with_port = suffix(hiera('mongodb_node_ips'), ':27017')
+ }
+ $mongodb_replset = hiera('mongodb::server::replset')
+ $mongo_node_string = join($mongo_node_ips_with_port, ',')
+ $database_connection = "mongodb://${mongo_node_string}/zaqar?replicaSet=${mongodb_replset}"
+
+ class { '::zaqar::management::mongodb':
+ uri => $database_connection,
+ }
+ class {'::zaqar::messaging::mongodb':
+ uri => $database_connection,
+ }
include ::zaqar::transport::websocket
include ::zaqar::transport::wsgi