diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-11 15:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-11 15:11:29 +0000 |
| commit | 8650d84a8ef7218e9a9d2353396019035274acda (patch) | |
| tree | accafc63f94a179c722ec76797cd949ad462e099 /nova/api | |
| parent | c2fd0866e2053b308180c259e412ea6b1bd39982 (diff) | |
| parent | 80724254edec09f6cd8f217c9ea695b7374d89b8 (diff) | |
Merge "Key requested_networks off of network extension"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 217c67361..ca446f24b 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -623,10 +623,13 @@ class Controller(wsgi.Controller): sg_names = list(set(sg_names)) - requested_networks = server_dict.get('networks') + requested_networks = None + if self.ext_mgr.is_loaded('os-networks'): + requested_networks = server_dict.get('networks') + if requested_networks is not None: requested_networks = self._get_requested_networks( - requested_networks) + requested_networks) (access_ip_v4, ) = server_dict.get('accessIPv4'), if access_ip_v4 is not None: |