From 7daa532c1a97a25834baf0ce91620489f0d882fa Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 7 Jan 2025 13:56:04 +0100 Subject: Align default tag with Kolla-Ansible Change-Id: Ic305125f32963dcc5a841e63dec2d368d0549eab Signed-off-by: Michal Nasiadka --- kolla/common/config.py | 4 +++- .../align-default-tag-with-kolla-ansible-7b2224d881848864.yaml | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/align-default-tag-with-kolla-ansible-7b2224d881848864.yaml diff --git a/kolla/common/config.py b/kolla/common/config.py index aec1e9d8c..d982ba501 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -218,7 +218,7 @@ _CLI_OPTS = [ help=('The number of threads to use while building.' ' (Note: setting to one will allow real time' ' logging)')), - cfg.StrOpt('tag', default=version.cached_version_string(), + cfg.StrOpt('tag', help='The container image tag'), cfg.BoolOpt('template-only', default=False, help="Don't build images. Generate Dockerfile only"), @@ -382,6 +382,8 @@ def parse(conf, args, usage=None, prog=None, # NOTE(jeffrey4l): set the default base tag based on the # base option conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag']) + conf.set_default('tag', + f"{conf.openstack_release}-{conf.base}-{conf.base_tag}") prefix = '' if conf.openstack_release == 'master' else 'stable-' openstack_branch = '{}{}'.format(prefix, conf.openstack_release) openstack_branch_slashed = openstack_branch.replace('-', '/') diff --git a/releasenotes/notes/align-default-tag-with-kolla-ansible-7b2224d881848864.yaml b/releasenotes/notes/align-default-tag-with-kolla-ansible-7b2224d881848864.yaml new file mode 100644 index 000000000..3d0339b36 --- /dev/null +++ b/releasenotes/notes/align-default-tag-with-kolla-ansible-7b2224d881848864.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The default value of the ``tag`` option has changed. Previously it + defaulted to the Kolla version string. It now defaults to a composite + value of ``--``, aligning with the + convention used by Kolla-Ansible. Users who relied on the implicit + version-based tag should set ``--tag`` explicitly to preserve the old + behaviour. -- cgit v1.2.3