diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-03 22:48:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-03 22:48:03 +0000 |
| commit | d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c (patch) | |
| tree | 7083a935fef281f68db263f9e1cf51161b89a641 /nova/api | |
| parent | 4726e3d8e1f6700dd19f5ec72a249d5c2dfb1efd (diff) | |
| parent | 12d9a5a38b9968f488b26822dc082ecbc484bbe9 (diff) | |
Merge "Make sure cloudpipe extension can retrieve network"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/cloudpipe.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index b5d87477e..dcdc87d16 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -98,6 +98,13 @@ class CloudpipeController(object): ips = [ip for ip in vif.fixed_ips() if ip['version'] == 4] if ips: rv['internal_ip'] = ips[0]['address'] + # NOTE(vish): Currently network_api.get does an owner check on + # project_id. This is probably no longer necessary + # but rather than risk changes in the db layer, + # we are working around it here by changing the + # project_id in the context. This can be removed + # if we remove the project_id check in the db. + elevated.project_id = project_id network = self.network_api.get(elevated, vif['network']['id']) if network: vpn_ip = network['vpn_public_address'] |