[ADMIN] Update INFO.yaml (new PTL and cleanup)

[demo.git] / heat / vLB / base_vlb.yaml

diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml
index 0d8c575..304d060 100644 (file)
--- a/heat/vLB/base_vlb.yaml
+++ b/heat/vLB/base_vlb.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -55,11 +55,11 @@ parameters:
     description: Private network that connects vLoadBalancer with vPacketGen
   onap_private_net_id:
     type: string
-    label: ECOMP management network name or ID
+    label: ONAP management network name or ID
     description: Private network that connects ONAP component and the VNF
   onap_private_subnet_id:
     type: string
-    label: ECOMP management sub-network name or ID
+    label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
   vlb_private_net_cidr:
     type: string
@@ -149,10 +149,6 @@ parameters:
     type: string
     label: Public key
     description: Public key to be installed on the compute instance
-  repo_url_artifacts:
-    type: string
-    label: Repository URL
-    description: URL of the repository that hosts the demo packages
   demo_artifacts_version:
     type: string
     label: Artifacts version used in demo vnfs
@@ -190,12 +186,12 @@ resources:
   my_keypair:
     type: OS::Nova::KeyPair
     properties:
-      name: 
+      name:
         str_replace:
           template: base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }  
+            rand: { get_resource: random-str }
       public_key: { get_param: pub_key }
       save_private_key: false
 
@@ -273,7 +269,6 @@ resources:
             __gre_ipaddr__: { get_param: gre_ipaddr }
             __pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
             __oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
-            __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __install_script_version__: { get_param: install_script_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -295,7 +290,6 @@ resources:
             echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt
             echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
             echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
@@ -306,6 +300,7 @@ resources:
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script
+            apt-get update
             apt-get -y install unzip
             if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
             curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
@@ -352,7 +347,6 @@ resources:
             __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
             __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
             __oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
-            __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __install_script_version__: { get_param: install_script_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -368,7 +362,6 @@ resources:
             echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
             echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
             echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
@@ -377,6 +370,7 @@ resources:
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script
+            apt-get update
             apt-get -y install unzip
             if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
             curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
@@ -417,7 +411,6 @@ resources:
       user_data:
         str_replace:
           params:
-            __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __local_private_ipaddr__: { get_param: vpg_private_ip_0 }
             __oam_private_ipaddr__: { get_param: vpg_private_ip_1 }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
@@ -439,7 +432,6 @@ resources:
             echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
             echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt
             echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
             echo "__pg_int__" > /opt/config/pg_int.txt
@@ -448,6 +440,7 @@ resources:
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script
+            apt-get update
             apt-get -y install unzip
             if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
             curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip