summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLvov Maxim <usrleon@gmail.com>2011-06-28 16:46:50 +0400
committerLvov Maxim <usrleon@gmail.com>2011-06-28 16:46:50 +0400
commitff195162d97f4a1ffaa6127f92cca102705b023b (patch)
tree279ea489866bdce5f4c336c9e624bc5a867a1187
parent3a83aaf4f14ac25dee8b5a84779a61ca4633012a (diff)
remove network to project bind
-rwxr-xr-xbin/nova-manage5
-rw-r--r--nova/network/manager.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 67cf0bd51..a4b221b8c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -619,7 +619,7 @@ class NetworkCommands(object):
@args('--project', dest="project_id", metavar='<Project name>', help='Project for network')
def create(self, fixed_range=None, num_networks=None, network_size=None,
vlan_start=None, vpn_start=None, fixed_range_v6=None,
- gateway_v6=None, label='public', project_id=None):
+ gateway_v6=None, label='public'):
"""Creates fixed ips for host by range"""
if not fixed_range:
@@ -649,8 +649,7 @@ class NetworkCommands(object):
vpn_start=int(vpn_start),
cidr_v6=fixed_range_v6,
gateway_v6=gateway_v6,
- label=label,
- project_id=project_id)
+ label=label)
except ValueError, e:
print e
raise e
diff --git a/nova/network/manager.py b/nova/network/manager.py
index a7f5aac60..b5352ca0f 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -571,8 +571,6 @@ class VlanManager(NetworkManager):
net['dhcp_start'] = str(project_net[3])
net['vlan'] = vlan
net['bridge'] = 'br%s' % vlan
- if 'project_id' in kwargs:
- net['project_id'] = kwargs['project_id']
if(FLAGS.use_ipv6):
cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],
significant_bits_v6)