From: Lusheng Ji <lji@research.att.com>
Date: Fri, 12 Oct 2018 20:39:28 +0000 (-0400)
Subject: config consul to proxy dns
X-Git-Tag: 1.4.4^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5ead4d963faa0a1c38a00c8cadbee5fa55879653;p=dcaegen2%2Fdeployments.git

config consul to proxy dns

Issue-ID: DCAEGEN2-865
Change-Id: I7b469d578963abb8a31ecc2fd9c7c0129102530e
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/heat/docker-compose-1.yaml b/heat/docker-compose-1.yaml
index 72c84df..3041d6c 100644
--- a/heat/docker-compose-1.yaml
+++ b/heat/docker-compose-1.yaml
@@ -36,13 +36,16 @@ services:
    consul:
       image: "consul:0.8.3"
       container_name: "consul"
+      privileged: true
       restart: "always"
       hostname: "consul"
       ports:
        - "8500:8500"
+       - "53:8600/udp"
+       - "53:8600/tcp"
       environment:
        - "DOCKER_HOST=tcp://{{ dcae_ip_addr }}:2376"
-      command: "agent -ui -server -bootstrap-expect 1 -client 0.0.0.0 -log-level trace"
+      command: "agent -ui -server -bootstrap-expect 1 -client 0.0.0.0 -log-level trace -recursor {{ dns_ip_addr }}"
       labels:
        - "SERVICE_8500_NAME=consul"
        - "SERVICE_8500_CHECK_HTTP=/v1/agent/services"
diff --git a/heat/register.sh b/heat/register.sh
index e1a74fd..c48d8b7 100755
--- a/heat/register.sh
+++ b/heat/register.sh
@@ -55,7 +55,7 @@ SRVCNAME_STATIC_DFC="static-dcaegen2-collectors-datafile"
 
 # registering docker host
 SVC_NAME="dockerhost"
-SVC_IP="$(cat /opt/config/dcae_ip_addr.txt)"
+SVC_IP="$(cat /opt/config/dcae_float_ip.txt)"
 REGREQ="
 {
   \"Name\" : \"${SVC_NAME}\",