diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 16:59:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 16:59:10 +0000 |
| commit | 6b0258abe3b0f07b129bbe9e79c8f3db5a4439a7 (patch) | |
| tree | ca61dfc722b604a19ff4f64183d9f692d40605a5 /docker | |
| parent | ea15697aa83a598acfa1952a3824c780d56d92dc (diff) | |
| parent | a2fe37fe89341b395a561f0c1e0f2c0e303d6ed3 (diff) | |
| download | kolla-6b0258abe3b0f07b129bbe9e79c8f3db5a4439a7.tar.gz kolla-6b0258abe3b0f07b129bbe9e79c8f3db5a4439a7.zip | |
Merge "Bump to latest ansible and deps"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_keystone_service.py | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_keystone_user.py | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 885565222..3a6c5a6a4 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -34,15 +34,15 @@ RUN apt-get -y --no-install-recommends install \ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ - && pip --no-cache-dir install --upgrade wheel \ && pip --no-cache-dir install \ MySQL-python \ - os-client-config==1.13.1 \ + os-client-config==1.16.0 \ pyudev \ - shade==1.3.0 + shade==1.4.0 -RUN git clone --depth 1 -b v2.0.0-0.7.rc2 https://github.com/ansible/ansible.git \ +RUN git clone https://github.com/ansible/ansible.git \ && cd ansible \ + && git checkout 915037c628ddcdfebd3e266710460376fcfaa91d \ && git submodule update --init --recursive \ && pip --no-cache-dir install . diff --git a/docker/kolla-toolbox/kolla_keystone_service.py b/docker/kolla-toolbox/kolla_keystone_service.py index 7c03d00e1..3551c2b99 100644 --- a/docker/kolla-toolbox/kolla_keystone_service.py +++ b/docker/kolla-toolbox/kolla_keystone_service.py @@ -50,6 +50,9 @@ def main(): service = None endpoint = None + # bcoca broke the loader! bcoca is working on the loaded. until then... + module.params['auth'] = json.loads( + module.params['auth'].replace("'", '"')) cloud = shade.operator_cloud(**module.params) for _service in cloud.keystone_client.services.list(): diff --git a/docker/kolla-toolbox/kolla_keystone_user.py b/docker/kolla-toolbox/kolla_keystone_user.py index 2d1a739c5..7688e1bd3 100644 --- a/docker/kolla-toolbox/kolla_keystone_user.py +++ b/docker/kolla-toolbox/kolla_keystone_user.py @@ -45,6 +45,9 @@ def main(): role = None user = None + # bcoca broke the loader! bcoca is working on the loaded. until then... + module.params['auth'] = json.loads( + module.params['auth'].replace("'", '"')) cloud = shade.operator_cloud(**module.params) for _project in cloud.keystone_client.tenants.list(): |