diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2
index e25ab520d8..0e6770ff4c 100644
--- a/docker/kolla-ansible/Dockerfile.j2
+++ b/docker/kolla-ansible/Dockerfile.j2
@@ -49,7 +49,7 @@ RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \
     && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \
     && useradd --user-group ansible --groups kolla
 
-COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py /usr/share/ansible/
+COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py /usr/share/ansible/
 COPY ansible.cfg /home/ansible/.ansible.cfg
 
 {{ include_footer }}
diff --git a/docker/kolla-ansible/kolla_sanity.py b/docker/kolla-ansible/kolla_sanity.py
new file mode 100644
index 0000000000..3227bfb949
--- /dev/null
+++ b/docker/kolla-ansible/kolla_sanity.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+
+# Copyright 2015 Intel corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is a barebones file needed to file a gap until Ansible 2.0. No
+# error checking, no deletions, no updates. Idempotent creation only.
+
+# If you look closely, you will see we arent _really_ using the shade module
+# we just use it to slightly abstract the authentication model. As patches land
+# in upstream shade we will be able to use more of the shade module. Until then
+# if we want to be 'stable' we really need to be using it as a passthrough
+
+import shade
+
+
+class SanityChecks(object):
+    @staticmethod
+    def keystone(cloud):
+        cloud.keystone_client.tenants.list()
+
+
+def main():
+    module = AnsibleModule(
+        argument_spec=openstack_full_argument_spec(
+            password=dict(required=True, type='str'),
+            project=dict(required=True, type='str'),
+            role=dict(required=True, type='str'),
+            user=dict(required=True, type='str'),
+            service=dict(required=True, type='str'),
+        )
+    )
+
+    try:
+        changed = True
+        cloud = shade.operator_cloud(**module.params)
+
+        getattr(SanityChecks, module.params.pop("service"))(cloud)
+
+        module.exit_json(changed=changed)
+    except Exception as e:
+        module.exit_json(failed=True, changed=True, msg=e)
+
+# import module snippets
+from ansible.module_utils.basic import *
+from ansible.module_utils.openstack import *
+if __name__ == '__main__':
+    main()