Resolving Merge Conflicts.
Included Log Aggregators and Log Forwarders as per review comments.
Spins two fluentd forwarder and one each fluentd aggregators-active, fluentd aggregator-standby
Commit to enable Fluentd Clustering in Voltha
https://jira.opencord.org/browse/VOL-214
Resolved merge conflicts .
Change-Id: I9d45f751b4297c707284582e8050a168229f2e5a
diff --git a/install/ansible/roles/cluster-host/tasks/main.yml b/install/ansible/roles/cluster-host/tasks/main.yml
index e3115ef..09e42e4 100644
--- a/install/ansible/roles/cluster-host/tasks/main.yml
+++ b/install/ansible/roles/cluster-host/tasks/main.yml
@@ -86,6 +86,12 @@
- snapd
tags: [cluster_host]
+- name: A fluentd directory under tmp for voltha logs exists
+ file:
+ path: "/tmp/fluentd"
+ state: directory
+ tags: [cluster_host]
+
- name: Dependent software is installed (this can take about 10 Min, DONT'T PANIC, go for coffee instead)
command: dpkg -R -i "{{ target_voltha_home }}/deb_files"
# ignore_errors: true
diff --git a/install/containers.cfg b/install/containers.cfg
index df0d264..a097e12 100644
--- a/install/containers.cfg
+++ b/install/containers.cfg
@@ -15,3 +15,4 @@
- gliderlabs/registrator:master
- voltha/envoy:latest
- registry:2
+ - cord/fluentd
diff --git a/install/voltha-swarm-start.sh b/install/voltha-swarm-start.sh
index be078e3..cd402c8 100755
--- a/install/voltha-swarm-start.sh
+++ b/install/voltha-swarm-start.sh
@@ -10,5 +10,6 @@
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-vcli.yml cli
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-chameleon-swarm.yml chameleon
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-netconf-swarm.yml netconf
+docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-fluentd-cluster.yml fluentd
docker service create -d --name tools --network voltha_net --network kafka_net --publish "4022:22" voltha/tools
diff --git a/install/voltha-swarm-stop.sh b/install/voltha-swarm-stop.sh
index 6b761af..9ea36e6 100644
--- a/install/voltha-swarm-stop.sh
+++ b/install/voltha-swarm-stop.sh
@@ -8,4 +8,6 @@
docker service rm tools
docker stack rm consul
docker stack rm kafka
+docker stack rm fluentd
+docker service rm tools
docker network rm voltha_net