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/docker/Dockerfile.fluentd b/docker/Dockerfile.fluentd
new file mode 100644
index 0000000..560e005
--- /dev/null
+++ b/docker/Dockerfile.fluentd
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 the original author or authors.
+#
+# 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.
+#
+
+#DockerFile to Create Fluentd Forwards inside cord-voltha
+FROM fluent/fluentd
+COPY fluentd_config/fluent.conf /fluentd/etc/