Merge "Fix hiera key colocate_haproxy"
This commit is contained in:
commit
59ff042425
@ -54,7 +54,7 @@ if $detach_keystone_plugin {
|
|||||||
/keystone/: {
|
/keystone/: {
|
||||||
$corosync_roles = $keystone_roles
|
$corosync_roles = $keystone_roles
|
||||||
$corosync_nodes = $keystone_nodes
|
$corosync_nodes = $keystone_nodes
|
||||||
$haproxy_colocate = 'false'
|
$colocate_haproxy = 'false'
|
||||||
$memcache_roles = $keystone_roles
|
$memcache_roles = $keystone_roles
|
||||||
$memcache_nodes = $keystone_nodes
|
$memcache_nodes = $keystone_nodes
|
||||||
$memcached_addresses = ipsort(values(get_node_to_ipaddr_map_by_network_role($keystone_nodes,'mgmt/memcache')))
|
$memcached_addresses = ipsort(values(get_node_to_ipaddr_map_by_network_role($keystone_nodes,'mgmt/memcache')))
|
||||||
@ -122,8 +122,8 @@ corosync_roles:
|
|||||||
%> - <%= crole %>
|
%> - <%= crole %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% if @haproxy_colocate -%>
|
<% if @colocate_haproxy -%>
|
||||||
haproxy_colocate: <%= @haproxy_colocate %>
|
colocate_haproxy: <%= @colocate_haproxy %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% if @memcache_nodes -%>
|
<% if @memcache_nodes -%>
|
||||||
<% require "yaml" -%>
|
<% require "yaml" -%>
|
||||||
|
Loading…
Reference in New Issue
Block a user