Remove Kazoo dependency and Kolla Zookeeper helper

Related-Bug: #1577194

Change-Id: Idad2a78d3b4251a321c1a05b435bff4625d5fe56
This commit is contained in:
Szymon Konefal 2016-08-19 15:13:31 +02:00
parent cafe368a72
commit e0a9347ebc
4 changed files with 2 additions and 71 deletions

View File

@ -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

View File

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

View File

@ -264,7 +264,6 @@ RUN ln -s openstack-base-source/* /requirements \
jsonpatch \
jsonpointer \
jsonschema \
kazoo \
keystoneauth1 \
keystonemiddleware \
kombu \

View File

@ -45,7 +45,7 @@ _PROFILE_OPTS = [
help='Main images'),
cfg.ListOpt('aux',
default=['aodh', 'designate', 'gnocchi', 'ironic',
'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper',
'magnum', 'mistral', 'trove,' 'zaqar',
'congress'],
help='Aux Images'),
cfg.ListOpt('default',