summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Hefner <ryan.hefner@netapp.com>2015-07-20 21:52:17 -0400
committerRyan Hefner <ryan.hefner@netapp.com>2015-08-05 10:08:10 -0400
commit4ba15f8918ea34a2de49f68ab66229d5c30adaf9 (patch)
treee6f4d368ae801ca6905448ca8f455bf87c4a1ce6
parent6486099b7934ddba9e5fc8e8ea886fefd9203142 (diff)
Enable Manila Service
Adds bindings to the Manila service for HAProxy. Change-Id: I175d5b7e35a781d04452fc6aee610e8dca005419
-rw-r--r--manifests/loadbalancer.pp46
1 files changed, 46 insertions, 0 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 99dd342..6797d9e 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -106,6 +106,11 @@
# When set, enables SSL on the Cinder public API endpoint using the specified file.
# Defaults to undef
#
+# [*manila_certificate*]
+# Filename of an HAProxy-compatible certificate and key file
+# When set, enables SSL on the Manila public API endpoint using the specified file.
+# Defaults to undef
+#
# [*glance_certificate*]
# Filename of an HAProxy-compatible certificate and key file
# When set, enables SSL on the Glance public API endpoint using the specified file.
@@ -157,6 +162,10 @@
# (optional) Enable or not Cinder API binding
# Defaults to false
#
+# [*manila*]
+# (optional) Enable or not Manila API binding
+# Defaults to false
+#
# [*glance_api*]
# (optional) Enable or not Glance API binding
# Defaults to false
@@ -244,6 +253,7 @@ class tripleo::loadbalancer (
$keystone_certificate = undef,
$neutron_certificate = undef,
$cinder_certificate = undef,
+ $manila_certificate = undef,
$glance_certificate = undef,
$nova_certificate = undef,
$ceilometer_certificate = undef,
@@ -255,6 +265,7 @@ class tripleo::loadbalancer (
$keystone_public = false,
$neutron = false,
$cinder = false,
+ $manila = false,
$glance_api = false,
$glance_registry = false,
$nova_ec2 = false,
@@ -385,6 +396,11 @@ class tripleo::loadbalancer (
} else {
$cinder_bind_certificate = $service_certificate
}
+ if $manila_certificate {
+ $manila_bind_certificate = $manila_certificate
+ } else {
+ $manila_bind_certificate = $service_certificate
+ }
if $glance_certificate {
$glance_bind_certificate = $glance_certificate
} else {
@@ -469,6 +485,19 @@ class tripleo::loadbalancer (
}
}
+ $manila_api_vip = hiera('manila_api_vip', $controller_virtual_ip)
+ if $manila_bind_certificate {
+ $manila_bind_opts = {
+ "${manila_api_vip}:8786" => [],
+ "${public_virtual_ip}:13786" => ['ssl', 'crt', $manila_bind_certificate],
+ }
+ } else {
+ $manila_bind_opts = {
+ "${manila_api_vip}:8786" => [],
+ "${public_virtual_ip}:8786" => [],
+ }
+ }
+
$glance_api_vip = hiera('glance_api_vip', $controller_virtual_ip)
if $glance_bind_certificate {
$glance_bind_opts = {
@@ -699,6 +728,23 @@ class tripleo::loadbalancer (
}
}
+ if manila {
+ haproxy::listen { 'manila':
+ bind => $manila_bind_opts,
+ options => {
+ 'option' => [ 'httpchk GET /' ],
+ },
+ collect_exported => false,
+ }
+ haproxy::balancermember { 'manila':
+ listening_service => 'manila',
+ ports => '8786',
+ ipaddresses => hiera('manila_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,