diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-13 14:21:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-13 14:21:17 +0000 |
| commit | 9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515 (patch) | |
| tree | 93fbc2d1cb5ded9a35db5baed3b29a4ac8c48d2a /kolla | |
| parent | 684eeab65e88e45adcf6d96eb4b0234fe5ed0e51 (diff) | |
| parent | 1e40f08e6c9d0dc5093d89b1c588b178c2f93e08 (diff) | |
| download | kolla-9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515.tar.gz kolla-9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515.zip | |
Merge "[publishing] use a new naming scheme"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ef5f70fd1..faad3576f 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-new-naming-scheme', default=False, + help='Use the new naming scheme (transitional option, ' + 'not to be set by end users)'), ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index ee0aaaf73..a186ba4b8 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -647,7 +647,10 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache - self.image_prefix = self.base + '-' + if self.conf.use_new_naming_scheme: + self.image_prefix = '' + else: + self.image_prefix = self.base + '-' self.regex = conf.regex self.image_statuses_bad = dict() |