diff options
| author | SamYaple <sam@yaple.net> | 2016-03-04 16:06:36 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-03-04 16:06:36 +0000 |
| commit | 6f23746177c87bc9bdbaaddf8db2b3c2ffb80b31 (patch) | |
| tree | 37c3b445b2ecda9f07bb1b2e64c74d03bb4dc48f /docker | |
| parent | e72c8f11472ce30adf02d0c39d6de144ac9b4fc7 (diff) | |
| download | kolla-6f23746177c87bc9bdbaaddf8db2b3c2ffb80b31.tar.gz kolla-6f23746177c87bc9bdbaaddf8db2b3c2ffb80b31.zip | |
Bump ansible version to head of devel
bcoca has asked we use head of devel to fix the loader issue
TrivialFix
Change-Id: Ie6f4b6bbdffed9a85c840a4f425d866fc5402f4b
Diffstat (limited to 'docker')
| -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(): |