openstack/fuel-library
Code Issues Proposed changes

Merge "Fix interfaces for quantum"

Browse Source
This commit is contained in:
vic 2012-12-26 22:21:01 +04:00 committed by Gerrit Code Review
commit 253a153bfe
2 changed files with 4 additions and 1 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,7 +146,6 @@ 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)

4
fuel_test/helpers.py
View File

@ -450,6 +450,10 @@ def only_private_interface(nodes):
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') execute(remote, 'dhclient eth1')
if OS_FAMILY == 'centos':
execute(remote, 'killall dhclient')
else:
execute(remote, 'killall dhclient3')
def kill_dhcpclient(nodes): def kill_dhcpclient(nodes):