summaryrefslogtreecommitdiffstats
path: root/OPENECOMP-DEMO-RACKSPACE
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-05-05 02:26:33 +0000
committerCarsten Lund <lund@research.att.com>2017-05-05 02:26:33 +0000
commit96a3aa69a12a257a18572a686366d683d91cf82d (patch)
treedfcddeb1201b9f464b5347ab373721360724e569 /OPENECOMP-DEMO-RACKSPACE
parent5e26ea3e299fdd98ddc1eea1bd436a1e2c7389d6 (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-RACKSPACE')
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/env.yaml2
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/hosts12
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml4
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts12
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts12
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts12
6 files changed, 26 insertions, 28 deletions
diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index 4c168d4..f455256 100644
--- a/OPENECOMP-DEMO-RACKSPACE/env.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -32,6 +32,8 @@ vm-templates:
open-ecomp-demo:
zone: "@{ZONE}"
+ dns-ip: 10.0.0.1
+ postgres-ip: 10.0.4.101
git:
mr-repo: "@{GIT-MR-REPO}"
maven:
diff --git a/OPENECOMP-DEMO-RACKSPACE/hosts b/OPENECOMP-DEMO-RACKSPACE/hosts
index 6d31447..56575b0 100644
--- a/OPENECOMP-DEMO-RACKSPACE/hosts
+++ b/OPENECOMP-DEMO-RACKSPACE/hosts
@@ -1,7 +1,7 @@
-10.0.4.1 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
-10.0.4.102 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
-10.0.4.104 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_ip_addr} zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00
+@{dcae_pstg00_ip_addr} zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00
+@{dcae_coll00_ip_addr} zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org
+@{dcae_cdap00_ip_addr} zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00
+@{dcae_cdap01_ip_addr} zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01
+@{dcae_cdap02_ip_addr} zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02
@{POLICY-IP} policy.api.simpledemo.openecomp.org
diff --git a/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml b/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml
index 6322099..09c86c3 100644
--- a/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml
@@ -2,12 +2,8 @@
### contains IP assignments VMs to floating ips
-zldc@{ZONE}@{STATE}cont00: 10.0.4.1
zldc@{ZONE}@{STATE}pstg00: 10.0.4.101
zldc@{ZONE}@{STATE}coll00: 10.0.4.102
zldc@{ZONE}@{STATE}cdap00: 10.0.4.103
zldc@{ZONE}@{STATE}cdap01: 10.0.4.104
zldc@{ZONE}@{STATE}cdap02: 10.0.4.105
-zldc@{ZONE}@{STATE}dmpb00: 10.0.4.106
-zldc@{ZONE}@{STATE}dbcl00: 10.0.4.107
-zldc@{ZONE}@{STATE}drps00: 10.0.4.108
diff --git a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts
index 8352252..b16d97b 100644
--- a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts
+++ b/OPENECOMP-DEMO-RACKSPACE/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-RACKSPACE/vm-config/vm-docker-host/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts
index 8352252..b16d97b 100644
--- a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts
+++ b/OPENECOMP-DEMO-RACKSPACE/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-RACKSPACE/vm-config/vm-postgresql/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts
index 8352252..b16d97b 100644
--- a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts
+++ b/OPENECOMP-DEMO-RACKSPACE/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