stackforge/puppet_openstack_builder
Code Issues Proposed changes

Merge pull request #161 from michaeltchapman/bff

Browse Source 
Fix wrong value in request for subnet that was breaking DHCP
This commit is contained in:
Robert Starmer
2013-10-17 06:34:27 -07:00
parent 7af3352ffd 2038cf513a
commit 9c4779109a
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stack-builder/build.py
View File

@@ -81,7 +81,7 @@ def make_subnet(q, ci_network_name, test_net, index=1, dhcp=True, gateway=False)
" 'network_id': " + test_net['id'] + ",\n" +
" 'ip_version': 4,\n" +
" 'cidr': '10.2." + str(index) + ".0/24',\n" +
" 'enable_dhcp': dhcp,\n" +
" 'enable_dhcp': True,\n" +
" 'gateway_ip': None}})['subnet']\n")
test_subnet = q.create_subnet({'subnet': { 'name': ci_network_name + str(index),
@@ -276,14 +276,6 @@ def make(n, q, k, args):
dprint ("ports")
dprint (json.dumps(ports,sort_keys=True, indent=4))
# Quantum won't schedule dhcp agents to networks when using
# port preallocation. This requires the admin role
agent = q.list_dhcp_agent_hosting_networks(networks['ci']['id'])
for name, network in networks.items():
if name != 'ci':
q.add_network_to_dhcp_agent(agent['agents'][0]['id'], {"network_id" : network['id']})
# config is a dictionary updated from env vars and user supplied
# yaml files to serve as input to hiera and build scripts
initial_config_meta = build_metadata(data_path, scenario, 'config')