diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-13 23:36:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-13 23:36:39 +0000 |
| commit | a002dfae1ab659a3d3a6d835c89fa73a1546fc3f (patch) | |
| tree | d1f60f536e87865c0d7a1f6e8458ced734065e6f /nova | |
| parent | 9a97c189d31586eaaa14994f382ae385b63dd442 (diff) | |
| parent | a253151a43c74ad838a5cde6fcd25ffdbe44bb15 (diff) | |
Merge "overriden VlanManager.create_networks must return a result"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 98764c063..e78942215 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1903,7 +1903,8 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): '%(num_networks)s. Network size is %(network_size)s') % kwargs) - NetworkManager.create_networks(self, context, vpn=True, **kwargs) + return NetworkManager.create_networks( + self, context, vpn=True, **kwargs) def _setup_network_on_host(self, context, network): """Sets up network on this host.""" |