Disable haproxy-vip colocation

We no longer need it since haproxy service does not migrate along
with VIPs, it's running on all needed roles.

Change-Id: I217b13391d10376e5c658b59c5aa3ee8df7c8d2c
This commit is contained in:
Aleksandr Didenko 2016-09-05 10:31:24 +02:00
parent ee4d8d3772
commit 6b089ec99c
1 changed files with 13 additions and 1 deletions

View File

@ -14,6 +14,14 @@ if roles_include($haproxy_roles){
$haproxy = false
}
# Since fuel-library saves database_vip in globals.yaml we need to calulate
# this VIP value here in order to not conflict with detach-database plugin.
$detach_database_plugin = hiera('detach-database', {})
$detach_database_yaml = pick($detach_database_plugin['yaml_additional_config'], "{}")
$detach_database_settings_hash = parseyaml($detach_database_yaml)
$database_vip = pick($detach_database_settings_hash['remote_database'],
try_get_value($vips, 'database/ipaddr', $mgmt_ip))
file {"/etc/hiera/plugins/${plugin_name}.yaml":
ensure => file,
content => inline_template("# Created by puppet, please do not edit manually
@ -44,6 +52,10 @@ corosync_roles: <%= @haproxy_roles %>
colocate_haproxy: false
<% end -%>
run_ping_checker: false
colocate_haproxy: false
service_endpoint: <%= @mgmt_ip %>
management_vip: <%= @mgmt_ip %>
public_vip: <%= @public_ip %>
database_vip: <%= @database_vip %>
")
}