summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Wiatrowski <kamilx.wiatrowski@intel.com>2019-03-25 16:02:50 +0000
committerKamil Wiatrowski <kamilx.wiatrowski@intel.com>2019-04-03 15:44:48 +0200
commit2744c2dc599635a08bfa352dbfe2f015eb526248 (patch)
tree1feb8ee735f0b5b11eef4ac3969a46972204cd84
parentcf5228e3ea9a9678844a85628b01433d1389425c (diff)
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 <radoslawx.jablonski@intel.com> Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
-rw-r--r--docker/ansible/collectd_ves.yml8
-rw-r--r--docker/ansible/default.inv4
-rw-r--r--docker/ansible/roles/run_kafka/vars/main.yml6
-rw-r--r--docker/ansible/roles/run_zookeeper/tasks/main.yml41
4 files changed, 55 insertions, 4 deletions
diff --git a/docker/ansible/collectd_ves.yml b/docker/ansible/collectd_ves.yml
index f6140a5..9e3bf46 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 9319b9e..d562a5f 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 4792cc2..1fc5b52 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 0000000..fdda300
--- /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