diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-02-20 14:42:49 -0500 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2018-02-20 14:42:56 -0500 |
| commit | 438257ad8f86b742935f2f44eaa6a6eb077d9336 (patch) | |
| tree | 4af0f4541c0a15ed830927a572f22011f4098bdf | |
| parent | 06432142579c09ac49443f4bf7c6d72d61afb974 (diff) | |
Change default DMaaP hostname
The changes are for the purpose of allowing DMAAPHOST environmental
variable to accept either hostname and IP address. If it is IP
address, the resolution for default dmaap hostname is written to
/etc/hosts; if hostname,an alias is created in /etc/host.aliases
for the default dmaap hostname.
(for the hostname aliasing to work, chnage default dmaap hostname
to onap-dmaap, no domain).
Change-Id: I58583cc5b678a29b54d8baecbd0b7bec621f7c8f
Signed-off-by: Lusheng Ji <lji@research.att.com>
Issue-ID: DCAEGEN2-235
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | etc/DmaapConfig.json | 6 | ||||
| -rw-r--r-- | src/main/scripts/docker-entry.sh | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -7,6 +7,7 @@ WORKDIR /opt/app/VESCollector ENV HOME /opt/app/VESCollector ENV JAVA_HOME /usr +ENV HOSTALIASES /etc/host.aliases RUN apt-get update && apt-get install -y \ curl \ diff --git a/etc/DmaapConfig.json b/etc/DmaapConfig.json index f144b382..529f314a 100644 --- a/etc/DmaapConfig.json +++ b/etc/DmaapConfig.json @@ -6,7 +6,7 @@ "class": "HpCambriaOutputStream",
"stripHpId": "true",
"type": "out",
- "cambria.hosts": "onap.dmaap.org"
+ "cambria.hosts": "onap-dmaap"
},
{
"name": "ves_fault",
@@ -14,7 +14,7 @@ "class": "HpCambriaOutputStream",
"stripHpId": "true",
"type": "out",
- "cambria.hosts": "onap.dmaap.org"
+ "cambria.hosts": "onap-dmaap"
},
{
"name": "ves_heartbeat",
@@ -22,7 +22,7 @@ "class": "HpCambriaOutputStream",
"stripHpId": "true",
"type": "out",
- "cambria.hosts": "onap.dmaap.org"
+ "cambria.hosts": "onap-dmaap"
}
]
}
diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh index 26dcb896..3b73005f 100644 --- a/src/main/scripts/docker-entry.sh +++ b/src/main/scripts/docker-entry.sh @@ -24,7 +24,11 @@ if [ ! -z "$COLLECTOR_IP" ]; then fi if [ ! -z "$DMAAPHOST" ]; then - echo $DMAAPHOST onap.dmaap.org >> /etc/hosts + if [ -z "$(echo $DMAAPHOST | sed -e 's/[0-9\.]//g')" ]; then + echo "$DMAAPHOST onap-dmaap" >> /etc/hosts + else + echo "onap-dmaap $DMAAPHOST" >> /etc/host.aliases + fi else echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED" fi |