diff options
| author |   Michael Hwang <mhwang@research.att.com> | 2018-10-18 13:41:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-18 13:41:54 +0000 |
| commit | 0745d89fe369cd77b4ab058ec3b7a7de828d7d65 (patch) | |
| tree | dfd13d65c1fa03182a617b237b2f7b078ce11516 | |
| parent | 419d3cbeaf9b85ff9103a78b1b85eb1c4dbeadcb (diff) | |
| parent | 5ead4d963faa0a1c38a00c8cadbee5fa55879653 (diff) | |
Merge "config consul to proxy dns"3.0.1-ONAP3.0.0-ONAP1.4.41.4.2
| -rw-r--r-- | heat/docker-compose-1.yaml | 5 | ||||
| -rwxr-xr-x | heat/register.sh | 2 |
2 files changed, 5 insertions, 2 deletions
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}\", |