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 /docker | |
| 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 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_keystone_service.py | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_keystone_user.py | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 50f0095fd..683650809 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -60,20 +60,22 @@ RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages|customizable("pi ENV PATH {{ virtualenv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible==2.2.0.0', - '"cmd2<0.9.0"', + 'ansible==2.8.*', + 'cmd2', 'influxdb', 'mysqlclient', - 'os-client-config==1.29.0', - 'pbr==4.0.0', + 'os-client-config', + 'pbr', 'pymongo', - 'python-openstackclient==3.14.0', + 'python-openstackclient', 'pytz', 'pyudev', - 'shade==1.27.1' + 'shade' ] %} -RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages"), constraints=false) }} \ +RUN mkdir -p /requirements \ + && curl -sSL -o /requirements/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/{{openstack_release}}/upper-constraints.txt \ + && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} diff --git a/docker/kolla-toolbox/kolla_keystone_service.py b/docker/kolla-toolbox/kolla_keystone_service.py index 866350821..74db35385 100644 --- a/docker/kolla-toolbox/kolla_keystone_service.py +++ b/docker/kolla-toolbox/kolla_keystone_service.py @@ -37,7 +37,8 @@ def main(): service_type=dict(required=True, type='str'), url=dict(required=True, type='str'), interface=dict(required=True, type='str'), - endpoint_region=dict(required=True, type='str') + endpoint_region=dict(required=True, type='str'), + endpoint_type=dict(type='str') ) module = AnsibleModule(argument_spec) diff --git a/docker/kolla-toolbox/kolla_keystone_user.py b/docker/kolla-toolbox/kolla_keystone_user.py index af7d0d6ec..c9631cd7c 100644 --- a/docker/kolla-toolbox/kolla_keystone_user.py +++ b/docker/kolla-toolbox/kolla_keystone_user.py @@ -24,7 +24,7 @@ from ansible.module_utils.openstack import openstack_full_argument_spec def main(): argument_spec = openstack_full_argument_spec( - password=dict(required=True, type='str'), + password=dict(required=True, type='str', no_log=True), project=dict(required=True, type='str'), role=dict(required=True, type='str'), user=dict(required=True, type='str') |