saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29572 from gtmanfred/2015.8

Browse source 
[nova] use old discover_extensions if available
This commit is contained in:
Mike Place 2015-12-09 10:35:42 -07:00
commit fe5db23863
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/openstack/nova.py
View file

@ -46,7 +46,7 @@ def check_nova():
min_ver = LooseVersion(NOVACLIENT_MINVER)
if novaclient_ver >= min_ver:
return HAS_NOVA
log.debug('Newer novaclient version required. Minimum: 2.6.1')
log.debug('Newer novaclient version required. Minimum: {0}'.format(NOVACLIENT_MINVER))
return False
@ -143,7 +143,7 @@ class SaltNova(OpenStackComputeShell):
self.kwargs = kwargs.copy()
if not novaclient.base.Manager._hooks_map:
self.extensions = client.discover_extensions('1.1')
self.extensions = getattr(self, '_discover_extensions', client.discover_extensions)('1.1')
for extension in self.extensions:
extension.run_hooks('__pre_parse_args__')
self.kwargs['extensions'] = self.extensions