valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #28041 from gtmanfred/develop

Browse Source 
use the correct discover_extensions
This commit is contained in:
Joseph Hall 2015-10-16 20:47:04 -06:00
commit 46b75af250
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/utils/openstack/nova.py
View File

@ -18,6 +18,7 @@ try:
from novaclient.v2 import client
except ImportError:
from novaclient.v1_1 import client
from novaclient import client as nclient
from novaclient.shell import OpenStackComputeShell
import novaclient.utils
import novaclient.auth_plugin
@ -137,7 +138,7 @@ class SaltNova(OpenStackComputeShell):
self.kwargs = kwargs.copy()
if not novaclient.base.Manager._hooks_map:
self.extensions = self._discover_extensions('1.1')
self.extensions = nclient.discover_extensions('1.1')
for extension in self.extensions:
extension.run_hooks('__pre_parse_args__')
self.kwargs['extensions'] = self.extensions