x
/
osops-tools-monitoring
Code Issues Proposed changes

python-glanceclient-2.6.0+ compatibility patch 

- fixed argument parser creation
- incremented default API version
- enabled default override from CLI

Change-Id: Ice2bc59ffd78271ec879578127ddc250e0aa10ab
This commit is contained in:
Martin Mágr 2017-08-15 09:26:52 +02:00
parent 4076dce887
commit c82aea0978
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monitoring-for-openstack/oschecks/utils.py
View File

@ -160,15 +160,19 @@ class Glance(object):
from glanceclient import shell
self.glance = shell.OpenStackImagesShell()
self.base_argv = copy.deepcopy(sys.argv[1:])
self.glance.parser = self.glance.get_base_parser()
self.glance.parser = self.glance.get_base_parser(sys.argv)
self.add_argument = self.glance.parser.add_argument
def setup(self, api_version=1):
def setup(self, api_version=2):
(options, args) = self.glance.parser.parse_known_args(self.base_argv)
if options.help:
options.command = None
self.glance.do_help(options)
sys.exit(2)
api_version = (
getattr(options, 'os_image_api_version', api_version) or
api_version
)
try:
client = self.glance._get_versioned_client(api_version, options)
except Exception as ex: