diff options
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 6 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index dda2e2010..8e31fc9f5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -248,7 +248,10 @@ _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') + 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)') ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index 7d8091682..dbd5dd6a3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -647,8 +647,10 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache - # TODO(hrw): to remove "source-" in a later patch - self.image_prefix = self.base + '-source-' + if self.conf.use_short_names: + self.image_prefix = self.base + '-' + else: + self.image_prefix = self.base + '-source-' self.regex = conf.regex self.image_statuses_bad = dict() diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 9b544b30f..6ed25975b 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -28,6 +28,8 @@ 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: |