diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2019-03-11 11:49:27 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2019-08-08 13:56:42 +0000 |
| commit | e3108d93c69dbad0c575da719f842d36c195a673 (patch) | |
| tree | f22ebe4eeaf00ce262bc54a338d0713fc13d40fb /kolla | |
| parent | bc717cba729815a7c8165c541006f13ac194dd4e (diff) | |
| download | kolla-e3108d93c69dbad0c575da719f842d36c195a673.tar.gz kolla-e3108d93c69dbad0c575da719f842d36c195a673.zip | |
Bump up pkg versions in kolla-toolbox
Currently we use Ansible 2.2 in kolla_toolbox, while lowest supported
version is 2.6 - bumping up to 2.8.
* Use upper constrains in Dockerfile.j2, instead of pinning them in
here - Ansible is pinned to 2.8.*
* Add no_log=True in kolla_keystone_user
* Add endpoint_type as a param in kolla_keystone_service - now
AnsibleModule requires all options to be defined, otherwise it throws
an UnsupportedParameter error
* Add openstack_release variable in kolla/common/config.py which
is used for fetching upper-constraints.txt for desired release
Change-Id: I2cb0ea2fde1b408d48b39bf7a54b898e850d31aa
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 3 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index d537303ad..c6d4e269a 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -35,6 +35,7 @@ DISTRO_RELEASE = { 'debian': 'buster', 'ubuntu': '18.04', } +OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures DELOREAN = \ @@ -269,6 +270,8 @@ _CLI_OPTS = [ help=('Squash the image layers. WARNING: it will consume lots' ' 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'), ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index 7b8dcd9af..8790f4e6b 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -672,6 +672,7 @@ class KollaWorker(object): elif self.base_arch == 'ppc64le': self.debian_arch = 'ppc64el' self.images = list() + self.openstack_release = conf.openstack_release rpm_setup_config = ([repo_file for repo_file in conf.rpm_setup_config if repo_file is not None]) self.rpm_setup = self.build_rpm_setup(rpm_setup_config) @@ -918,6 +919,7 @@ class KollaWorker(object): 'image_prefix': self.image_prefix, 'install_type': self.install_type, 'namespace': self.namespace, + 'openstack_release': self.openstack_release, 'tag': self.tag, 'maintainer': self.maintainer, 'kolla_version': kolla_version, |