diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
| commit | 96a3aa69a12a257a18572a686366d683d91cf82d (patch) | |
| tree | dfcddeb1201b9f464b5347ab373721360724e569 /OPENECOMP-DEMO-2-NIC | |
| parent | 5e26ea3e299fdd98ddc1eea1bd436a1e2c7389d6 (diff) | |
[DCAE-7] updates for Vanilla Openstack support
Change-Id: Ib49c6afe4c616729aee1ce06d64f50a0765fcde1
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'OPENECOMP-DEMO-2-NIC')
| -rw-r--r-- | OPENECOMP-DEMO-2-NIC/env.yaml | 2 | ||||
| -rw-r--r-- | OPENECOMP-DEMO-2-NIC/vm-config/vm-cdap-cluster/hosts | 12 | ||||
| -rw-r--r-- | OPENECOMP-DEMO-2-NIC/vm-config/vm-docker-host/hosts | 12 | ||||
| -rw-r--r-- | OPENECOMP-DEMO-2-NIC/vm-config/vm-postgresql/hosts | 12 |
4 files changed, 20 insertions, 18 deletions
diff --git a/OPENECOMP-DEMO-2-NIC/env.yaml b/OPENECOMP-DEMO-2-NIC/env.yaml index 4c168d4..d25ef9e 100644 --- a/OPENECOMP-DEMO-2-NIC/env.yaml +++ b/OPENECOMP-DEMO-2-NIC/env.yaml @@ -32,6 +32,8 @@ vm-templates: open-ecomp-demo: zone: "@{ZONE}" + dns-ip: "@{DNS-IP-ADDR}" + postgres-ip: "@{dcae_pstg00_ip_addr}" git: mr-repo: "@{GIT-MR-REPO}" maven: diff --git a/OPENECOMP-DEMO-2-NIC/vm-config/vm-cdap-cluster/hosts b/OPENECOMP-DEMO-2-NIC/vm-config/vm-cdap-cluster/hosts index 8352252..b16d97b 100644 --- a/OPENECOMP-DEMO-2-NIC/vm-config/vm-cdap-cluster/hosts +++ b/OPENECOMP-DEMO-2-NIC/vm-config/vm-cdap-cluster/hosts @@ -1,11 +1,11 @@ -10.0.4.1 zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 +@{dcae_ip_addr} zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 -10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 +@{dcae_pstg00_ip_addr} zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 -10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org +@{dcae_coll00_ip_addr} zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org -10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 +@{dcae_cdap00_ip_addr} zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 -10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 +@{dcae_cdap01_ip_addr} zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 -10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 +@{dcae_cdap02_ip_addr} zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 diff --git a/OPENECOMP-DEMO-2-NIC/vm-config/vm-docker-host/hosts b/OPENECOMP-DEMO-2-NIC/vm-config/vm-docker-host/hosts index 8352252..b16d97b 100644 --- a/OPENECOMP-DEMO-2-NIC/vm-config/vm-docker-host/hosts +++ b/OPENECOMP-DEMO-2-NIC/vm-config/vm-docker-host/hosts @@ -1,11 +1,11 @@ -10.0.4.1 zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 +@{dcae_ip_addr} zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 -10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 +@{dcae_pstg00_ip_addr} zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 -10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org +@{dcae_coll00_ip_addr} zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org -10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 +@{dcae_cdap00_ip_addr} zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 -10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 +@{dcae_cdap01_ip_addr} zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 -10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 +@{dcae_cdap02_ip_addr} zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 diff --git a/OPENECOMP-DEMO-2-NIC/vm-config/vm-postgresql/hosts b/OPENECOMP-DEMO-2-NIC/vm-config/vm-postgresql/hosts index 8352252..b16d97b 100644 --- a/OPENECOMP-DEMO-2-NIC/vm-config/vm-postgresql/hosts +++ b/OPENECOMP-DEMO-2-NIC/vm-config/vm-postgresql/hosts @@ -1,11 +1,11 @@ -10.0.4.1 zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 +@{dcae_ip_addr} zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 -10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 +@{dcae_pstg00_ip_addr} zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00 -10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org +@{dcae_coll00_ip_addr} zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org -10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 +@{dcae_cdap00_ip_addr} zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 -10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 +@{dcae_cdap01_ip_addr} zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01 -10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 +@{dcae_cdap02_ip_addr} zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02 |