diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-11 14:27:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-11 14:27:15 +0000 |
| commit | e17ca09fa51193e8395b8a32a5eae7a2c8f4846f (patch) | |
| tree | b18316af375035464a81c7f60912b95bca546cf3 | |
| parent | 09d03a9b438fd742ab7e0f12a0dcdbe43c483835 (diff) | |
| parent | 556e8f9eeef71d240bef961cee0e3e5d357e3711 (diff) | |
| download | kolla-e17ca09fa51193e8395b8a32a5eae7a2c8f4846f.tar.gz kolla-e17ca09fa51193e8395b8a32a5eae7a2c8f4846f.zip | |
Merge "Fix GitHub tarball URL for monasca-thresh"
| -rwxr-xr-x | kolla/common/config.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index f5075a378..15e6848d2 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -232,9 +232,14 @@ _CLI_OPTS = [ ' of disk IO. "docker-squash" tool is required, install' ' it by "pip install docker-squash"')), cfg.StrOpt('openstack-release', default=OPENSTACK_RELEASE, - help='OpenStack release for building kolla-toolbox'), - cfg.StrOpt('openstack-branch', default='master', - help='Branch for source images'), + help='OpenStack release for building kolla source images and ' + 'kolla-toolbox image'), + cfg.StrOpt('openstack-branch', + help='Branch for source images (internal; with a dash; ' + 'please set openstack-release instead)'), + cfg.StrOpt('openstack-branch-slashed', + help='Branch for source images (internal; with a slash; ' + 'please set openstack-release instead)'), cfg.BoolOpt('docker-healthchecks', default=True, help='Add Kolla docker healthcheck scripts in the image'), cfg.BoolOpt('quiet', short='q', default=False, @@ -498,7 +503,7 @@ SOURCES = { 'monasca-thresh': { 'type': 'url', 'location': ('https://github.com/openstack/monasca-thresh/archive/' - 'master.tar.gz')}, + '${openstack_branch_slashed}.tar.gz')}, 'monasca-thresh-additions-monasca-common': { 'type': 'url', 'location': ('$tarballs_base/openstack/monasca-common/' @@ -1018,7 +1023,9 @@ def parse(conf, args, usage=None, prog=None, conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag']) prefix = '' if conf.openstack_release == 'master' else 'stable-' openstack_branch = '{}{}'.format(prefix, conf.openstack_release) + openstack_branch_slashed = openstack_branch.replace('-', '/') conf.set_default('openstack_branch', openstack_branch) + conf.set_default('openstack_branch_slashed', openstack_branch_slashed) if not conf.base_image: conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name'] |