openstack/fuel-library
Code Issues Proposed changes

Merge "Remove default routes via hapr-p/hapr-m in haproxy ns"

Browse Source
This commit is contained in:
Jenkins 2015-03-18 10:08:47 +00:00 committed by Gerrit Code Review
commit de7ea04ef1
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp
View File

@ -22,13 +22,10 @@ $vips = { # Do not convert to ARRAY, It can't work in 2.7
ns_veth => "hapr-m",
ip => hiera('management_vip'),
cidr_netmask => $vip_management_cidr_netmask,
gateway => 'link',
gateway_metric => '20',
gateway => 'none',
gateway_metric => '0',
bridge => $network_scheme['roles']['management'],
other_networks => $vip_mgmt_other_nets,
iptables_start_rules => "iptables -t mangle -I PREROUTING -i ${internal_int}-hapr -j MARK --set-mark 0x2b ; iptables -t nat -I POSTROUTING -m mark --mark 0x2b ! -o ${network_scheme['roles']['management']} -j MASQUERADE",
iptables_stop_rules => "iptables -t mangle -D PREROUTING -i ${internal_int}-hapr -j MARK --set-mark 0x2b ; iptables -t nat -D POSTROUTING -m mark --mark 0x2b ! -o ${network_scheme['roles']['management']} -j MASQUERADE",
iptables_comment => "masquerade-for-management-net",
with_ping => false,
ping_host_list => "",
},
@ -62,13 +59,10 @@ if $public_int {
ns_veth => 'hapr-p',
ip => hiera('public_vip'),
cidr_netmask => $vip_public_cidr_netmask,
gateway => 'link',
gateway_metric => '10',
gateway => 'none',
gateway_metric => '0',
bridge => $network_scheme['roles']['ex'],
other_networks => $vip_publ_other_nets,
iptables_start_rules => "iptables -t mangle -I PREROUTING -i ${public_int}-hapr -j MARK --set-mark 0x2a ; iptables -t nat -I POSTROUTING -m mark --mark 0x2a ! -o ${network_scheme['roles']['ex']} -j MASQUERADE",
iptables_stop_rules => "iptables -t mangle -D PREROUTING -i ${public_int}-hapr -j MARK --set-mark 0x2a ; iptables -t nat -D POSTROUTING -m mark --mark 0x2a ! -o ${network_scheme['roles']['ex']} -j MASQUERADE",
iptables_comment => "masquerade-for-public-net",
tie_with_ping => hiera('run_ping_checker', true),
ping_host_list => $network_scheme['endpoints']['br-ex']['gateway'],
}