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/Makefile b/Makefile
index 91d7711..f7135bf 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,9 @@
prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator golang envoyd envoy
containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy
+prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator envoy registry fluentd
+
+containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools envoy fluentd
docker-base:
docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -127,6 +130,9 @@
tools:
docker build -t voltha/tools -f docker/Dockerfile.tools .
+fluentd:
+ docker build -t cord/fluentd -f docker/Dockerfile.fluentd .
+
envoy:
docker build -t voltha/envoy -f docker/Dockerfile.envoy .