diff --git a/kolla/common/config.py b/kolla/common/config.py index 8e31fc9f5c..dda2e2010d 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 dbd5dd6a37..ee0aaaf734 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 6ed25975b0..9b544b30f1 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: