aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/loadbalancer.pp4
-rw-r--r--manifests/pacemaker/haproxy_with_vip.pp64
2 files changed, 66 insertions, 2 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index eb4a6fc..f9d0473 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -290,7 +290,7 @@
# 'nova_novnc_port' (Defaults to 6080)
# 'nova_novnc_ssl_port' (Defaults to 13080)
# 'sahara_api_port' (Defaults to 8386)
-# 'sahara_api_ssl_port' (Defaults to 13779)
+# 'sahara_api_ssl_port' (Defaults to 13386)
# 'swift_proxy_port' (Defaults to 8080)
# 'swift_proxy_ssl_port' (Defaults to 13808)
# 'trove_api_port' (Defaults to 8779)
@@ -389,7 +389,7 @@ class tripleo::loadbalancer (
nova_novnc_port => 6080,
nova_novnc_ssl_port => 13080,
sahara_api_port => 8386,
- sahara_api_ssl_port => 13786,
+ sahara_api_ssl_port => 13386,
swift_proxy_port => 8080,
swift_proxy_ssl_port => 13808,
trove_api_port => 8779,
diff --git a/manifests/pacemaker/haproxy_with_vip.pp b/manifests/pacemaker/haproxy_with_vip.pp
new file mode 100644
index 0000000..0539beb
--- /dev/null
+++ b/manifests/pacemaker/haproxy_with_vip.pp
@@ -0,0 +1,64 @@
+# Copyright 2016 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Define: tripleo::pacemaker::haproxy_with_vip
+#
+# Configure the vip with the haproxy under pacemaker
+#
+# === Parameters:
+#
+# [*vip_name*]
+# (String) Logical name of the vip (control, public, storage ...)
+# Required
+#
+# [*ip_address*]
+# (String) IP address on which HAProxy is colocated
+# Required
+#
+# [*ensure*]
+# (Boolean) Create the all the resources only if true. False won't
+# destroy the resource, it will just not create them.
+# Default to true
+define tripleo::pacemaker::haproxy_with_vip($vip_name, $ip_address, $ensure = true) {
+ if($ensure) {
+ if is_ipv6_address($ip_address) {
+ $netmask = '64'
+ } else {
+ $netmask = '32'
+ }
+
+ pacemaker::resource::ip { "${vip_name}_vip":
+ ip_address => $ip_address,
+ cidr_netmask => $netmask,
+ }
+ pacemaker::constraint::base { "${vip_name}_vip-then-haproxy":
+ constraint_type => 'order',
+ first_resource => "ip-${ip_address}",
+ second_resource => 'haproxy-clone',
+ first_action => 'start',
+ second_action => 'start',
+ constraint_params => 'kind=Optional',
+ require => [Pacemaker::Resource::Service['haproxy'],
+ Pacemaker::Resource::Ip["${vip_name}_vip"]],
+ }
+ pacemaker::constraint::colocation { "${vip_name}_vip-with-haproxy":
+ source => "ip-${ip_address}",
+ target => 'haproxy-clone',
+ score => 'INFINITY',
+ require => [Pacemaker::Resource::Service['haproxy'],
+ Pacemaker::Resource::Ip["${vip_name}_vip"]],
+ }
+ }
+}