diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-05 01:24:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-05 01:24:39 +0000 |
| commit | 8976263153f7fe7d294df74a49b3f5d9fbcd68ed (patch) | |
| tree | 969eb3192051f306aa7909723d33a0e3490b86e0 | |
| parent | 32ce37cb8f22d19fe33901ccc81f0a7792e1416d (diff) | |
| parent | 6f23746177c87bc9bdbaaddf8db2b3c2ffb80b31 (diff) | |
| download | kolla-8976263153f7fe7d294df74a49b3f5d9fbcd68ed.tar.gz kolla-8976263153f7fe7d294df74a49b3f5d9fbcd68ed.zip | |
Merge "Bump ansible version to head of devel"
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -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, 1 insertions, 7 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index d41fe1b1c..20e692f77 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -42,7 +42,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN git clone https://github.com/ansible/ansible.git \ && cd ansible \ - && git checkout 915037c628ddcdfebd3e266710460376fcfaa91d \ + && git checkout 89569d035ea5002302a0a6b03451a4963fd83eb3 \ && 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 6363042f7..bc06fd61f 100644 --- a/docker/kolla-toolbox/kolla_keystone_service.py +++ b/docker/kolla-toolbox/kolla_keystone_service.py @@ -48,9 +48,6 @@ 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 f1d7b2bb8..789019788 100644 --- a/docker/kolla-toolbox/kolla_keystone_user.py +++ b/docker/kolla-toolbox/kolla_keystone_user.py @@ -45,9 +45,6 @@ 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.projects.list(): |