openstack/fuel-library
Code Issues Proposed changes

main Quantum router -- is #1

Browse Source
This commit is contained in:
Sergey Vasilenko 2013-07-23 22:51:07 +04:00 committed by Vladimir Kuklin
parent 3a3390771c
commit 9ee1070936
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/haproxy/templates/haproxy_balancermember.erb
View File

@ -1,6 +1,6 @@
<% for @host in @balancers.keys.sort %>server <%= @host %> <%= @balancers[@host] %>:<%= balancer_port %> <%
items = balancermember_options
items = [items] unless balancermember_options.instance_of? Array
items.each do |item| %> <% if @define_cookies == true %> cookie <%= @host %> <% end %> <%= item %> <% if @define_backend == true and @balancers.keys.first != @host %> backup <% end %> <% end %>
items.each do |item| %> <% if @define_cookies == true %> cookie <%= @host %> <% end %> <%= item %> <% if @define_backend == true && (@balancers.keys.sort.first != @host) %> backup <% end %> <% end %>
<% end -%>

2
deployment/puppet/openstack/manifests/controller_ha.pp
View File

@ -201,7 +201,7 @@ class openstack::controller_ha (
haproxy_service { 'glance-api': order => 80, port => 9292, virtual_ips => [$public_virtual_ip, $internal_virtual_ip] }
if $quantum {
haproxy_service { 'quantum': order => 85, port => 9696, virtual_ips => [$public_virtual_ip, $internal_virtual_ip] }
haproxy_service { 'quantum': order => 85, port => 9696, virtual_ips => [$public_virtual_ip, $internal_virtual_ip], define_backend => true }
}
haproxy_service { 'glance-reg': order => 90, port => 9191, virtual_ips => [$internal_virtual_ip] }