openstack
/
fuel-qa
Code Issues Proposed changes

Use IP address from 2nd admin net for boot via PXE 

In tests for multiple cluster networks we configure 2nd
admin network interface on master node in order to
bootstrap slaves from non-default nodegroup. When we use
IP from default admin network for PXE nodes from 2nd
nodegroup fail to boot (due to new firewall NAT rules),
so changing boot host to IP from 2nd admin network.

Change-Id: Iee8d349877eb93bfe2627c54efd28c17f629db93
Closes-bug: #1448978
This commit is contained in:
Artem Panchenko 2015-04-27 18:00:32 +03:00
parent 28fb4d2a26
commit e9e1648d0f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuelweb_test/helpers/multiple_networks_hacks.py
View File

@ -30,11 +30,8 @@ from fuelweb_test import logwrap
def configure_second_admin_cobbler(self):
dhcp_template = '/etc/cobbler/dnsmasq.template'
remote = self.d_env.get_admin_remote()
admin_net = self.d_env.admin_net
admin_net2 = self.d_env.admin_net2
second_admin_if = settings.INTERFACES.get(admin_net2)
main_admin_ip = str(
self.d_env.nodes().admin.get_ip_address_by_network_name(admin_net))
second_admin_ip = str(
self.d_env.nodes().admin.get_ip_address_by_network_name(admin_net2))
@ -46,13 +43,13 @@ def configure_second_admin_cobbler(self):
discovery_subnet = [net for net in network.iter_subnets(1)][-1]
first_discovery_address = str(discovery_subnet.network)
last_discovery_address = str(discovery_subnet.broadcast - 1)
new_range = ('interface={5}\\n'
new_range = ('interface={4}\\n'
'dhcp-range=internal2,{0},{1},{2}\\n'
'dhcp-option=net:internal2,option:router,{3}\\n'
'dhcp-boot=net:internal2,pxelinux.0,boothost,{4}\\n').\
'pxe-service=net:internal2,x86PC,"Install",pxelinux,{3}\\n'
'dhcp-boot=net:internal2,pxelinux.0,boothost,{3}\\n').\
format(first_discovery_address, last_discovery_address,
second_admin_netmask, second_admin_ip, main_admin_ip,
second_admin_if)
second_admin_netmask, second_admin_ip, second_admin_if)
cmd = ("dockerctl shell cobbler sed -r '$a \{0}' -i {1};"
"dockerctl shell cobbler cobbler sync").format(new_range,
dhcp_template)