Update scale out use case

- add new parameter "dns_enabled" to Heat
- change branch name in install scripts

Change-Id: I62b6ee99ea00a02424f0a02043a4d933a0e23309
Issue-ID: INT-696
Signed-off-by: Marco Platania <platania@research.att.com>

7 files changed, 15 insertions, 7 deletions

diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index 6b485307..afcb0a57 100644
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -22,14 +22,15 @@ parameters:
   vlb_name_0: zdfw1lb01lb01
   vdns_name_0: zdfw1lb01dns01
   vpg_name_0: zdfw1lb01pg01
+  dns_enabled: true
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
-  nb_api_version: 1.2.0
+  nb_api_version: 1.3.0-SNAPSHOT
   demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.3.0-SNAPSHOT
   key_name: vlb_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
-  cloud_env: PUT openstack OR backspace HERE
+  cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index ff5da416..e96cf624 100644
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/base_vlb.yaml
@@ -172,6 +172,9 @@ parameters:
   sec_group:
     type: string
     description: ONAP Security Group
+  dns_enabled:
+    type: string
+    description: Enable/disable DNS (by default use true)
 
 #############
 #           #
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index ffdf44e8..ca4172d5 100644
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -13,11 +13,12 @@ parameters:
   vdns_private_ip_0: 192.168.10.212
   vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
   vdns_name_0: zdfw1lb01dns02
+  dns_enabled: true
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
-  nb_api_version: 1.2.0
+  nb_api_version: 1.3.0-SNAPSHOT
   install_script_version: 1.3.0-SNAPSHOT
   key_name: vlb_key_scaling
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
-  cloud_env: PUT openstack OR backspace HERE
+  cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml
index db0d8d76..7dcc4628 100644
--- a/heat/vLBMS/dnsscaling.yaml
+++ b/heat/vLBMS/dnsscaling.yaml
@@ -124,6 +124,9 @@ parameters:
   sec_group:
     type: string
     description: ONAP Security Group
+  dns_enabled:
+    type: string
+    description: Enable/disable DNS (by default use true)
 
 #############
 #           #
diff --git a/vnfs/vLBMS/scripts/v_dns_install.sh b/vnfs/vLBMS/scripts/v_dns_install.sh
index 61e11109..606a7ff4 100644
--- a/vnfs/vLBMS/scripts/v_dns_install.sh
+++ b/vnfs/vLBMS/scripts/v_dns_install.sh
@@ -68,7 +68,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin beijing
+git pull --depth=1 origin master
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF
diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh
index 412b53aa..66dbedda 100644
--- a/vnfs/vLBMS/scripts/v_lb_install.sh
+++ b/vnfs/vLBMS/scripts/v_lb_install.sh
@@ -85,7 +85,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin beijing
+git pull --depth=1 origin master
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF
diff --git a/vnfs/vLBMS/scripts/v_packetgen_install.sh b/vnfs/vLBMS/scripts/v_packetgen_install.sh
index 333218be..c01adab0 100644
--- a/vnfs/vLBMS/scripts/v_packetgen_install.sh
+++ b/vnfs/vLBMS/scripts/v_packetgen_install.sh
@@ -74,7 +74,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin beijing
+git pull --depth=1 origin master
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF