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
This commit is contained in:
parent
e877556aaf
commit
08b80e34da
|
@ -248,10 +248,7 @@ _CLI_OPTS = [
|
||||||
cfg.BoolOpt('enable-unbuildable', default=False,
|
cfg.BoolOpt('enable-unbuildable', default=False,
|
||||||
help='Enable images marked as unbuildable'),
|
help='Enable images marked as unbuildable'),
|
||||||
cfg.BoolOpt('summary', default=True,
|
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 = [
|
_BASE_OPTS = [
|
||||||
|
|
|
@ -647,10 +647,7 @@ class KollaWorker(object):
|
||||||
|
|
||||||
self.clean_package_cache = self.conf.clean_package_cache
|
self.clean_package_cache = self.conf.clean_package_cache
|
||||||
|
|
||||||
if self.conf.use_short_names:
|
self.image_prefix = self.base + '-'
|
||||||
self.image_prefix = self.base + '-'
|
|
||||||
else:
|
|
||||||
self.image_prefix = self.base + '-source-'
|
|
||||||
|
|
||||||
self.regex = conf.regex
|
self.regex = conf.regex
|
||||||
self.image_statuses_bad = dict()
|
self.image_statuses_bad = dict()
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
DEFAULT:
|
DEFAULT:
|
||||||
namespace: "{{ kolla_namespace }}"
|
namespace: "{{ kolla_namespace }}"
|
||||||
tag: "{{ (zuul.branch | basename) ~ tag_suffix }}"
|
tag: "{{ (zuul.branch | basename) ~ tag_suffix }}"
|
||||||
# NOTE(hrw): we want to publish short names
|
|
||||||
use_short_names: true
|
|
||||||
set_fact:
|
set_fact:
|
||||||
kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"
|
kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"
|
||||||
when:
|
when:
|
||||||
|
|
Loading…
Reference in New Issue