openstack/fuel-library
Code Issues Proposed changes

Merge "Fix interfaces for quantum"

Browse Source
This commit is contained in:
Alexey Abashkin 2012-12-26 19:57:26 +04:00 committed by Gerrit Code Review
commit acd3d1c4e3
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuel_test/ci/ci_base.py
View File

@ -146,6 +146,7 @@ class CiBase(object):
self.setup_master_node(master_remote, environment.nodes) self.setup_master_node(master_remote, environment.nodes)
self.setup_agent_nodes(environment.nodes) self.setup_agent_nodes(environment.nodes)
only_private_interface(self.quantum_nodes()) only_private_interface(self.quantum_nodes())
kill_dhcpclient(self.quantum_nodes())
sleep(5) sleep(5)
sign_all_node_certificates(master_remote) sign_all_node_certificates(master_remote)
sleep(5) sleep(5)

2
fuel_test/config/interfaces_quantum_ubuntu.config
View File

@ -8,5 +8,7 @@ iface lo inet loopback
# The primary network interface # The primary network interface
auto eth0 eth1 eth2 auto eth0 eth1 eth2
iface eth0 inet manual iface eth0 inet manual
up ifconfig $IFACE 0.0.0.0 up
down ifconfig $IFACE down
iface eth1 inet dhcp iface eth1 inet dhcp
iface eth2 inet dhcp iface eth2 inet dhcp

1
fuel_test/helpers.py
View File

@ -449,6 +449,7 @@ def only_private_interface(nodes):
path = '/etc/network/interfaces' path = '/etc/network/interfaces'
write_config(remote, path, load(root('fuel_test', 'config', 'interfaces_quantum_ubuntu.config'))) write_config(remote, path, load(root('fuel_test', 'config', 'interfaces_quantum_ubuntu.config')))
execute(remote, 'ifup eth0') execute(remote, 'ifup eth0')
execute(remote, 'dhclient eth1')
def kill_dhcpclient(nodes): def kill_dhcpclient(nodes):