diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 17:33:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 17:33:35 +0000 |
| commit | 51b325ca38769684b73b3ec161e471ccad610fc5 (patch) | |
| tree | 93578e4568edfe4519b95107da044ba1d6458524 /nova/api | |
| parent | bd30dae12eb4e58f269eecdfab37d1f95fdcbe89 (diff) | |
| parent | e0fd027d2d0cb0939998204b200059061771bc07 (diff) | |
Merge "Server create will only process "networks" if os-networks is loaded."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index c21599300..00aa35538 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -775,7 +775,8 @@ class Controller(wsgi.Controller): sg_names = list(set(sg_names)) requested_networks = None - if self.ext_mgr.is_loaded('os-networks'): + if (self.ext_mgr.is_loaded('os-networks') + or self._is_quantum_v2()): requested_networks = server_dict.get('networks') if requested_networks is not None: |