diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-20 17:25:58 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-21 17:01:08 +0200 |
| commit | 08b80e34dae0236e6b106e7debcdb755508fe1d9 (patch) | |
| tree | 3ac90e35007585205613cd78e3fefb874d402478 | |
| parent | e877556aafb2b571152567a8fc1f6ec640ffb2a4 (diff) | |
| download | kolla-08b80e34dae0236e6b106e7debcdb755508fe1d9.tar.gz kolla-08b80e34dae0236e6b106e7debcdb755508fe1d9.zip | |
switch to short image names by default
We can drop temporary 'use-short-names' argument and make short
(kolla/debian-nova-libvirt:master) image names default.
Kolla Ansible is using short names now.
Change-Id: I153355353cd12aa25adaa9c87438a478748dfb28
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 8e31fc9f5..dda2e2010 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -248,10 +248,7 @@ _CLI_OPTS = [ cfg.BoolOpt('enable-unbuildable', default=False, help='Enable images marked as unbuildable'), cfg.BoolOpt('summary', default=True, - help='Show summary at the end of build'), - cfg.BoolOpt('use-short-names', default=False, - help='Use image names without install_type ' - '(transition option - to be removed)') + help='Show summary at the end of build') ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index dbd5dd6a3..ee0aaaf73 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -647,10 +647,7 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache - if self.conf.use_short_names: - self.image_prefix = self.base + '-' - else: - self.image_prefix = self.base + '-source-' + self.image_prefix = self.base + '-' self.regex = conf.regex self.image_statuses_bad = dict() diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 6ed25975b..9b544b30f 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -28,8 +28,6 @@ DEFAULT: namespace: "{{ kolla_namespace }}" tag: "{{ (zuul.branch | basename) ~ tag_suffix }}" - # NOTE(hrw): we want to publish short names - use_short_names: true set_fact: kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}" when: |