openstack/tripleo-common
Code Issues Proposed changes

Rename argument back to append_tag

Browse Source 
This argument is considered stable library API, and was renamed as
part of Ie7f628bb54c83c78e810320c739afff158234804, which is causing
issues for tripleoclient which calls it.

Change-Id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
Closes-Bug: #1785872
This commit is contained in:
Steve Baker
2018-08-08 09:39:49 +12:00
parent 53c64c1651
commit 3c9af5772c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tripleo_common/image/kolla_builder.py
View File

@@ -153,7 +153,7 @@ def container_images_prepare_multi(environment, roles_data, dry_run=False,
output_env_file='image_params',
output_images_file='upload_data',
tag_from_label=cip_entry.get('tag_from_label'),
modify_append_tag=modify_append_tag,
append_tag=modify_append_tag,
modify_role=modify_role,
modify_vars=modify_vars,
modify_only_with_labels=modify_only_with_labels,
@@ -190,7 +190,7 @@ def container_images_prepare(template_file=DEFAULT_TEMPLATE_FILE,
pull_source=None, push_destination=None,
mapping_args=None, output_env_file=None,
output_images_file=None, tag_from_label=None,
modify_append_tag=None, modify_role=None,
append_tag=None, modify_role=None,
modify_vars=None, modify_only_with_labels=None):
"""Perform container image preparation
@@ -210,7 +210,7 @@ def container_images_prepare(template_file=DEFAULT_TEMPLATE_FILE,
:param output_images_file: key to use for image upload data
:param tag_from_label: string when set will trigger tag discovery on every
image
:param modify_append_tag: string to append to the tag for the destination
:param append_tag: string to append to the tag for the destination
image
:param modify_role: string of ansible role name to run during upload before
the push to destination
@@ -270,6 +270,7 @@ def container_images_prepare(template_file=DEFAULT_TEMPLATE_FILE,
images, modify_only_with_labels)
params = {}
modify_append_tag = append_tag
for entry in result:
imagename = entry.get('imagename', '')
append_tag = ''