diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-01-07 13:56:04 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-05-27 16:00:15 +0200 |
| commit | 7daa532c1a97a25834baf0ce91620489f0d882fa (patch) | |
| tree | d479a474412a043fd5c7dc4dbf7cf289fa6189cd /kolla | |
| parent | e8d8d12ac27b71972767aeedd17ed91f320df2ff (diff) | |
| download | kolla-7daa532c1a97a25834baf0ce91620489f0d882fa.tar.gz kolla-7daa532c1a97a25834baf0ce91620489f0d882fa.zip | |
Align default tag with Kolla-Ansible
Change-Id: Ic305125f32963dcc5a841e63dec2d368d0549eab
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
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('-', '/') |