Merge "Bump ansible version to head of devel"

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 .
 

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():

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():