openstack/puppet-tripleo
Code Issues Proposed changes

Enable Manila Service

Browse Source 
Adds bindings to the Manila service for HAProxy.

Change-Id: I175d5b7e35a781d04452fc6aee610e8dca005419
This commit is contained in:
Ryan Hefner 2015-07-20 21:52:17 -04:00
parent 6486099b79
commit 4ba15f8918
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
manifests/loadbalancer.pp
View File

@ -106,6 +106,11 @@
# When set, enables SSL on the Cinder public API endpoint using the specified file. # When set, enables SSL on the Cinder public API endpoint using the specified file.
# Defaults to undef # 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*] # [*glance_certificate*]
# Filename of an HAProxy-compatible certificate and key file # Filename of an HAProxy-compatible certificate and key file
# When set, enables SSL on the Glance public API endpoint using the specified 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 # (optional) Enable or not Cinder API binding
# Defaults to false # Defaults to false
# #
# [*manila*]
# (optional) Enable or not Manila API binding
# Defaults to false
#
# [*glance_api*] # [*glance_api*]
# (optional) Enable or not Glance API binding # (optional) Enable or not Glance API binding
# Defaults to false # Defaults to false
@ -244,6 +253,7 @@ class tripleo::loadbalancer (
$keystone_certificate = undef, $keystone_certificate = undef,
$neutron_certificate = undef, $neutron_certificate = undef,
$cinder_certificate = undef, $cinder_certificate = undef,
$manila_certificate = undef,
$glance_certificate = undef, $glance_certificate = undef,
$nova_certificate = undef, $nova_certificate = undef,
$ceilometer_certificate = undef, $ceilometer_certificate = undef,
@ -255,6 +265,7 @@ class tripleo::loadbalancer (
$keystone_public = false, $keystone_public = false,
$neutron = false, $neutron = false,
$cinder = false, $cinder = false,
$manila = false,
$glance_api = false, $glance_api = false,
$glance_registry = false, $glance_registry = false,
$nova_ec2 = false, $nova_ec2 = false,
@ -385,6 +396,11 @@ class tripleo::loadbalancer (
} else { } else {
$cinder_bind_certificate = $service_certificate $cinder_bind_certificate = $service_certificate
} }
if $manila_certificate {
$manila_bind_certificate = $manila_certificate
} else {
$manila_bind_certificate = $service_certificate
}
if $glance_certificate { if $glance_certificate {
$glance_bind_certificate = $glance_certificate $glance_bind_certificate = $glance_certificate
} else { } 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) $glance_api_vip = hiera('glance_api_vip', $controller_virtual_ip)
if $glance_bind_certificate { if $glance_bind_certificate {
$glance_bind_opts = { $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 { if $glance_api {
haproxy::listen { 'glance_api': haproxy::listen { 'glance_api':
bind => $glance_bind_opts, bind => $glance_bind_opts,