summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-05 17:23:31 +0000
committerGerrit Code Review <review@openstack.org>2016-01-05 17:23:31 +0000
commit4a5f1bc6bc5fe28c2f2f64a3485bac2a697de0ac (patch)
tree80710fd78dac26a19e303185404a91ceb3dd60e2
parent7817be5e71aae3a4e770ba5aff045e37d421ca3d (diff)
parent3d34404e3a33bb99be87d244b0e93fcad1704b6d (diff)
Merge "Trove integration"
-rw-r--r--manifests/loadbalancer.pp43
1 files changed, 43 insertions, 0 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index c4959ac..887c9d2 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -143,6 +143,11 @@
# When set, enables SSL on the Sahara public API endpoint using the specified file.
# Defaults to undef
#
+# [*trove_certificate*]
+# Filename of an HAProxy-compatible certificate and key file
+# When set, enables SSL on the Trove public API endpoint using the specified file.
+# Defaults to undef
+#
# [*swift_certificate*]
# Filename of an HAProxy-compatible certificate and key file
# When set, enables SSL on the Swift public API endpoint using the specified file.
@@ -187,6 +192,10 @@
# (optional) Enable or not Sahara API binding
# defaults to false
#
+# [*trove*]
+# (optional) Enable or not Trove API binding
+# defaults to false
+#
# [*glance_api*]
# (optional) Enable or not Glance API binding
# Defaults to false
@@ -285,6 +294,7 @@ class tripleo::loadbalancer (
$neutron_certificate = undef,
$cinder_certificate = undef,
$sahara_certificate = undef,
+ $trove_certificate = undef,
$manila_certificate = undef,
$glance_certificate = undef,
$nova_certificate = undef,
@@ -299,6 +309,7 @@ class tripleo::loadbalancer (
$neutron = false,
$cinder = false,
$sahara = false,
+ $trove = false,
$manila = false,
$glance_api = false,
$glance_registry = false,
@@ -437,6 +448,11 @@ class tripleo::loadbalancer (
} else {
$sahara_bind_certificate = $service_certificate
}
+ if $trove_certificate {
+ $trove_bind_certificate = $trove_certificate
+ } else {
+ $trove_bind_certificate = $trove_certificate
+ }
if $manila_certificate {
$manila_bind_certificate = $manila_certificate
} else {
@@ -570,6 +586,19 @@ class tripleo::loadbalancer (
}
}
+ $trove_api_vip = hiera('$trove_api_vip', $controller_virtual_ip)
+ if $trove_bind_certificate {
+ $trove_bind_opts = {
+ "${trove_api_vip}:8779" => [],
+ "${public_virtual_ip}:13779" => ['ssl', 'crt', $trove_bind_certificate],
+ }
+ } else {
+ $trove_bind_opts = {
+ "${trove_api_vip}:8779" => [],
+ "${public_virtual_ip}:8779" => [],
+ }
+ }
+
$nova_api_vip = hiera('nova_api_vip', $controller_virtual_ip)
if $nova_bind_certificate {
$nova_osapi_bind_opts = {
@@ -823,6 +852,20 @@ class tripleo::loadbalancer (
}
}
+ if $trove {
+ haproxy::listen { 'trove':
+ bind => $trove_bind_opts,
+ collect_exported => false,
+ }
+ haproxy::balancermember { 'trove':
+ listening_service => 'trove',
+ ports => '8779',
+ ipaddresses => hiera('trove_api_node_ips', $controller_hosts_real),
+ server_names => $controller_hosts_names_real,
+ options => ['check', 'inter 2000', 'rise 2', 'fall 5'],
+ }
+ }
+
if $glance_api {
haproxy::listen { 'glance_api':
bind => $glance_bind_opts,