diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2017-06-13 02:40:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-06-13 02:40:17 +0000 |
| commit | 8911aea5e891453dd03337d98399070565392a90 (patch) | |
| tree | 5f39a9e9d9f9323ca619926c5ef6b36a1a26bd98 | |
| parent | 90866e4a66207a88d5cd3bce1e04ee3a353fef2f (diff) | |
| parent | d5c75c54d310c3fdd6f0244b8917bee0da6208c0 (diff) | |
Merge "[DCAE-7] Updates to allow VES collector to get IP"
| -rw-r--r-- | OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml | 1 | ||||
| -rw-r--r-- | OPENECOMP-DEMO-2-NIC/env.yaml | 1 | ||||
| -rw-r--r-- | OPENECOMP-DEMO-RACKSPACE/env.yaml | 1 | ||||
| -rw-r--r-- | OPENECOMP-DEMO/docker-templates/docker-common-event.yaml | 2 |
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 |