[DCAE-7] updates for Vanilla Openstack support

Change-Id: Ib49c6afe4c616729aee1ce06d64f50a0765fcde1
Signed-off-by: Carsten Lund <lund@research.att.com>

diff --git a/OPENECOMP-DEMO-2-NIC/env.yaml b/OPENECOMP-DEMO-2-NIC/env.yaml
index 4c168d4..d25ef9e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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

diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index 4c168d4..f455256 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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

diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties
index 03cc7d6..c2e1c6f 100644 (file)
--- a/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties
@@ -16,14 +16,8 @@ server.header.Access-Control-Allow-Credentials: true
 server.noauth./swagger: server.noauth./swagger
 server.noauth.swagger: server.noauth.swagger
 
-
-
 server.user.monitoring = uedkkdslafdskljf
 
-
-
-##policy.endpoint=http://c4.vm1.policy.simpledemo.openecomp.org:8480
-#policy.endpoint=http://10.0.6.1:8480
 policy.endpoint=http://policy.api.simpledemo.openecomp.org:8480
 policy.user=testrest
 policy.password=3c0mpU#h01@N1c3

diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/inventory.properties b/OPENECOMP-DEMO/vm-config/vm-controller/inventory.properties
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index d731097..de4c43f 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -21,9 +21,9 @@ installation-steps:
 
 - step: shell
   command: |
-    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
-    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
-    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >>  /etc/resolv.conf
+    echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head
 
 - step: shell
   command: |

diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index e0da7c4..171b305 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -104,9 +104,9 @@ installation-steps:
     
 - step: shell
   command: |
-    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
-    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
-    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >>  /etc/resolv.conf
+    echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head
     
 - step: shell
   command: |
@@ -168,7 +168,7 @@ vm-setup:
         
         DMAAPBC_PG_ENABLED=true
         #DMAAPBC_PGHOST=zldciad1vipstg00.dcae.simpledemo.openecomp.org
-        DMAAPBC_PGHOST=10.0.4.101
+        DMAAPBC_PGHOST=${dcae.env('open-ecomp-demo.postgres-ip')}
         DMAAPBC_PGCRED=test234-ftl
         
         DMAAPBC_DRPROV_FQDN=zldciad1vidrps00.simpledemo.openecomp.org

diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index 8d67385..2ab5beb 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -48,9 +48,9 @@ installation-steps:
 
 - step: shell
   command: |
-    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
-    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
-    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head  
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >>  /etc/resolv.conf
+    echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf
+    echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head  
 
 - step: maven-artifact
   group-id: org.openecomp.dcae.controller

diff --git a/dcae-demo-controller/src/main/docker-build/build.sh b/dcae-demo-controller/src/main/docker-build/build.sh
index df42c9f..2500aa8 100644 (file)
--- a/dcae-demo-controller/src/main/docker-build/build.sh
+++ b/dcae-demo-controller/src/main/docker-build/build.sh
@@ -24,7 +24,7 @@ cp $ROOT/target/assembly/lib/*.jar lib/
 # copy configuration files for controller
 ( 
   cd $ROOT/..
-  tar cfz - OPENECOMP-DEMO OPENECOMP-DEMO-RACKSPACE 
+  tar cfz - OPENECOMP-DEMO OPENECOMP-DEMO-* 
 ) > config.tar.gz
 
 if [ "$1" == "nobuild" ]; then exit; fi

diff --git a/dcae-demo-controller/src/main/docker-build/controller-startup.sh b/dcae-demo-controller/src/main/docker-build/controller-startup.sh
index a5b6a02..e31c72b 100644 (file)
--- a/dcae-demo-controller/src/main/docker-build/controller-startup.sh
+++ b/dcae-demo-controller/src/main/docker-build/controller-startup.sh
@@ -12,6 +12,7 @@ export PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:/opt/app/git/2.4.1/bin:$PATH
 cd /opt/app/dcae-controller-platform-server
 
 export ZONE=$(grep ZONE /opt/app/dcae-controller/config.yaml | sed s/ZONE:.//)
+export BASE=$(grep BASE /opt/app/dcae-controller/config.yaml | sed s/BASE:.//)
 
 OPENSTACK_KEYNAME=$(grep OPENSTACK-KEYNAME /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-KEYNAME:.//)
 NETWORK=$(grep OPENSTACK-PRIVATE-NETWORK /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-PRIVATE-NETWORK:.//)

diff --git a/dcae-demo-controller/src/main/docker-build/controller.makefile b/dcae-demo-controller/src/main/docker-build/controller.makefile
index 40b570e..b1eb11b 100644 (file)
--- a/dcae-demo-controller/src/main/docker-build/controller.makefile
+++ b/dcae-demo-controller/src/main/docker-build/controller.makefile
@@ -1,7 +1,7 @@
 
 restart: stop start
 gen-config:
-       bin/dcae-controller.sh rackspace-substitute --from OPENECOMP-DEMO-RACKSPACE --to OPENECOMP-DEMO-$(ZONE) --file /opt/app/dcae-controller/config.yaml
+       bin/dcae-controller.sh rackspace-substitute --from OPENECOMP-DEMO-$(BASE) --to OPENECOMP-DEMO-$(ZONE) --file /opt/app/dcae-controller/config.yaml
        java -cp 'lib/*' org.openecomp.dcae.controller.operation.utils.GenControllerConfiguration $(ZONE) . GITLINK OPENECOMP-DEMO
 sync:
        bin/dcae-controller.sh sync-configuration --environment OPENECOMP-DEMO-$(ZONE)