From 2744c2dc599635a08bfa352dbfe2f015eb526248 Mon Sep 17 00:00:00 2001 From: Kamil Wiatrowski Date: Mon, 25 Mar 2019 16:02:50 +0000 Subject: ansible: Add zookeeper to one click install Previously 'zookeeper' docker container should be installed manually by user - now it is a part of ansible one click install for VES. Change-Id: If3873cffa51ddf04d2c3769705259aaf5928cc45 Signed-off-by: Radoslaw Jablonski Signed-off-by: Kamil Wiatrowski --- docker/ansible/collectd_ves.yml | 8 ++++- docker/ansible/default.inv | 4 +++ docker/ansible/roles/run_kafka/vars/main.yml | 6 ++-- docker/ansible/roles/run_zookeeper/tasks/main.yml | 41 +++++++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 docker/ansible/roles/run_zookeeper/tasks/main.yml (limited to 'docker/ansible') diff --git a/docker/ansible/collectd_ves.yml b/docker/ansible/collectd_ves.yml index f6140a5f..9e3bf463 100644 --- a/docker/ansible/collectd_ves.yml +++ b/docker/ansible/collectd_ves.yml @@ -13,7 +13,7 @@ # limitations under the License. --- -- hosts: collectd_hosts kafka_hosts ves_hosts +- hosts: collectd_hosts kafka_hosts ves_hosts zookeeper_hosts become: true become_user: root gather_facts: true @@ -27,6 +27,12 @@ - config_files - run_collectd +- hosts: zookeeper_hosts + become: true + become_user: root + roles: + - run_zookeeper + - hosts: kafka_hosts become: true become_user: root diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv index 9319b9ea..d562a5f0 100644 --- a/docker/ansible/default.inv +++ b/docker/ansible/default.inv @@ -25,6 +25,10 @@ insert_ipmi_modules=true [prometheus_hosts] #localhost +[zookeeper_hosts] +#NOTE: currently one zookeper host is supported +#hostname + [kafka_hosts] #hostname diff --git a/docker/ansible/roles/run_kafka/vars/main.yml b/docker/ansible/roles/run_kafka/vars/main.yml index 4792cc20..1fc5b528 100644 --- a/docker/ansible/roles/run_kafka/vars/main.yml +++ b/docker/ansible/roles/run_kafka/vars/main.yml @@ -13,7 +13,7 @@ # limitations under the License. --- -zookeeper_hostname: zookeeper -zookeeper_host_ip: 127.0.0.1 +zookeeper_hostname: "{{ (groups['zookeeper_hosts']|default({}))[0] | default('localhost') }}" +zookeeper_host_ip: "{{ hostvars[zookeeper_hostname].ansible_default_ipv4.address }}" -broker_id: 0 +broker_id: "0" diff --git a/docker/ansible/roles/run_zookeeper/tasks/main.yml b/docker/ansible/roles/run_zookeeper/tasks/main.yml new file mode 100644 index 00000000..fdda300d --- /dev/null +++ b/docker/ansible/roles/run_zookeeper/tasks/main.yml @@ -0,0 +1,41 @@ +#Copyright 2019 OPNFV and 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. +--- + +- name: Remove bar-zookeeper container + docker_container: + name: bar-zookeeper + state: absent + tags: + - remove_containers + - remove_bar-zookeeper + when: rm_containers|default(false)|bool == true + +- name: Remove zookeeper image + docker_image: + state: absent + name: zookeeper:3.4.11 + tags: + - remove_images + - remove_zookeeper_image + when: rm_images|default(false)|bool == true + +- name: launch zookeeper container + docker_container: + name: bar-zookeeper + image: zookeeper:3.4.11 + detach: yes + state: started + restart: yes + network_mode: host -- cgit 1.2.3-korg