diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_zookeeper.py | 68 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 |
3 files changed, 1 insertions, 70 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 97ca256df..c6c8bd915 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -60,7 +60,7 @@ RUN useradd -m --user-group ansible --groups kolla \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} -COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.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 COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers diff --git a/docker/kolla-toolbox/kolla_zookeeper.py b/docker/kolla-toolbox/kolla_zookeeper.py deleted file mode 100644 index 3142c0f5a..000000000 --- a/docker/kolla-toolbox/kolla_zookeeper.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/python - -# Copyright 2015 Mirantis, Inc. -# -# 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. - -import contextlib -import traceback - -import kazoo.client -import kazoo.exceptions - - -@contextlib.contextmanager -def zk_connection(zk_host, zk_port): - zk = kazoo.client.KazooClient(hosts='{}:{}'.format(zk_host, zk_port)) - zk.start() - yield zk - zk.stop() - - -def main(): - module = AnsibleModule( - argument_spec=dict( - zk_host=dict(required=True, type='str'), - zk_port=dict(required=True, type='str'), - path=dict(required=True, type='str'), - value=dict(required=False, default=None, type='str') - ) - ) - - try: - zk_host = module.params.pop('zk_host') - zk_port = module.params.pop('zk_port') - path = module.params.pop('path') - value = module.params.pop('value') - - changed = False - with zk_connection(zk_host, zk_port) as zk: - try: - zk.get(path) - except kazoo.exceptions.NoNodeError: - if value is None: - zk.create(path, makepath=True) - else: - zk.create(path, value=value.encode(), makepath=True) - changed = True - - module.exit_json(changed=changed) - except Exception: - module.exit_json(failed=True, changed=True, - msg=repr(traceback.format_exc())) - - -# import module snippets -from ansible.module_utils.basic import * # noqa -if __name__ == '__main__': - main() diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 300adbec7..c3d6dc2a9 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -264,7 +264,6 @@ RUN ln -s openstack-base-source/* /requirements \ jsonpatch \ jsonpointer \ jsonschema \ - kazoo \ keystoneauth1 \ keystonemiddleware \ kombu \ |