summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-06-11 11:03:52 +0000
committerCarsten Lund <lund@research.att.com>2017-06-11 11:03:52 +0000
commitd5c75c54d310c3fdd6f0244b8917bee0da6208c0 (patch)
tree02c18c8a7911aadd9a13d5e6cb464f2b09c8e680
parent482b3a84c594130a938f3b296b7520c0ad57ed5c (diff)
[DCAE-7] Updates to allow VES collector to get IP
Change-Id: I1471973b4885d7d0470d44db94039084d06c0823 Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml1
-rw-r--r--OPENECOMP-DEMO-2-NIC/env.yaml1
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/env.yaml1
-rw-r--r--OPENECOMP-DEMO/docker-templates/docker-common-event.yaml2
4 files changed, 5 insertions, 0 deletions
diff --git a/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml b/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
index d40ecd8..e443adb 100644
--- a/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
+++ b/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
@@ -34,6 +34,7 @@ open-ecomp-demo:
zone: "@{ZONE}"
dns-ip: "@{DNS-IP-ADDR}"
postgres-ip: "@{dcae_pstg00_float_ip_addr}"
+ collector-ip: "@{dcae_coll00_float_ip_addr}"
flavor: "@{FLAVOR-LARGE}"
image:
ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
diff --git a/OPENECOMP-DEMO-2-NIC/env.yaml b/OPENECOMP-DEMO-2-NIC/env.yaml
index c915d33..63236b8 100644
--- a/OPENECOMP-DEMO-2-NIC/env.yaml
+++ b/OPENECOMP-DEMO-2-NIC/env.yaml
@@ -34,6 +34,7 @@ open-ecomp-demo:
zone: "@{ZONE}"
dns-ip: "@{DNS-IP-ADDR}"
postgres-ip: "@{dcae_pstg00_ip_addr}"
+ collector-ip: "@{dcae_coll00_float_ip_addr}"
flavor: "@{FLAVOR-LARGE}"
image:
ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index f738ef9..ffa9440 100644
--- a/OPENECOMP-DEMO-RACKSPACE/env.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -34,6 +34,7 @@ open-ecomp-demo:
zone: "@{ZONE}"
dns-ip: 10.0.0.1
postgres-ip: 10.0.4.101
+ collector-ip: 10.0.4.102
flavor: 8 GB Performance
image:
ubuntu14-04: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
diff --git a/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
index aa4fbe3..be6df72 100644
--- a/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
+++ b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
@@ -16,6 +16,8 @@ controller-instance-configuration:
- "/var/config/DCAE/${dcae.serviceName}/${dcae.instanceName}/manager:/opt/app/manager/config"
- "/opt/app/dcae-certificate:/opt/app/dcae-certificate"
- "/opt/app/groovy:/opt/app/groovy"
+ envs:
+ - "COLLECTOR_IP=${dcae.env('open-ecomp-demo.collector-ip')}"
cport: 8080
csecport: 8443
keystoreloc: /opt/app/dcae-certificate/keystore.jks