From 8ea64c4ec6117854828ac6b23eb53ea1acfec92d Mon Sep 17 00:00:00 2001 From: PranaliD Date: Tue, 4 Jul 2017 12:34:51 +0530 Subject: [PATCH] Modified --os-image option in overcloud image upload While using --os-image option in overcloud image upload command from python-tripleoclient, it was getting translated somehow into the OS_IMAGE env variable which was causing conflict. Changed os-image to os-image-name to avoid the conflict. Change-Id: Id55c838714263c0f886a7402ab72dfb1820cee7c Closes-Bug: 1693344 (cherry picked from commit dd5cb7885c7bc3534aa194a9612a45cff8bf2531) --- .../modify-os-image-parameter-004b1cc81df2b88e.yaml | 6 ++++++ tripleoclient/v1/overcloud_image.py | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/modify-os-image-parameter-004b1cc81df2b88e.yaml diff --git a/releasenotes/notes/modify-os-image-parameter-004b1cc81df2b88e.yaml b/releasenotes/notes/modify-os-image-parameter-004b1cc81df2b88e.yaml new file mode 100644 index 000000000..fc5ce833e --- /dev/null +++ b/releasenotes/notes/modify-os-image-parameter-004b1cc81df2b88e.yaml @@ -0,0 +1,6 @@ +--- +features: + - Added new os-image-name parameter, that replaces + os-image one, because it was conflicting with + glance parameter naming, causing os-image to + don't work properly. diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index 2c6bd6ac4..adacce1e9 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -755,8 +755,8 @@ class UploadOvercloudImage(command.Command): help=_("Path to directory containing image files"), ) parser.add_argument( - "--os-image", - default=os.environ.get('OS_IMAGE', 'overcloud-full.qcow2'), + "--os-image-name", + default=os.environ.get('OS_IMAGE_NAME', 'overcloud-full.qcow2'), help=_("OpenStack disk image filename"), ) parser.add_argument( @@ -790,14 +790,14 @@ class UploadOvercloudImage(command.Command): if parsed_args.whole_disk: image_files = [ - parsed_args.os_image + parsed_args.os_image_name ] overcloud_image_type = 'whole disk' else: image_files = [ '%s.initramfs' % os.environ['AGENT_NAME'], '%s.kernel' % os.environ['AGENT_NAME'], - parsed_args.os_image + parsed_args.os_image_name ] overcloud_image_type = 'partition' @@ -805,7 +805,7 @@ class UploadOvercloudImage(command.Command): self._check_file_exists(os.path.join(parsed_args.image_path, image)) - image_name = parsed_args.os_image.split('.')[0] + image_name = parsed_args.os_image_name.split('.')[0] self.log.debug("uploading %s overcloud images to glance" % overcloud_image_type)