vFW CNF CDS scripts update for native Helm support

[demo.git] / heat / vCPE_build / vgw / build_vcpe_vgw.yaml

diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
index 3bd8532..84c4d81 100644 (file)
--- a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
+++ b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
@@ -73,10 +73,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
   script_version:
     type: string
     label: Script version number
@@ -151,28 +147,26 @@ resources:
       name: { get_param: vgw_name_0 }
       key_name: { get_resource: my_keypair }
       networks:
-        - network: { get_param: public_net_id } 
+        - network: { get_param: public_net_id }
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __script_version__ : { get_param: script_version }
-            __cloud_env__ : { get_param: cloud_env }
-            __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
-            __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
-            __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
-            __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __script_version__: { get_param: script_version }
+            __cloud_env__: { get_param: cloud_env }
+            __vpp_source_repo_url__: { get_param: vpp_source_repo_url }
+            __vpp_source_repo_release_tag__: { get_param: vpp_source_repo_release_tag }
+            __hc2vpp_source_repo_url__: { get_param: hc2vpp_source_repo_url }
+            __hc2vpp_source_repo_release_tag__: { get_param: hc2vpp_source_repo_release_tag }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __compile_state__ : {get_param : compile_state}
+            __compile_state__: {get_param: compile_state}
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir /opt/config
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__script_version__" > /opt/config/script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
@@ -184,6 +178,7 @@ resources:
             echo "__compile_state__" > /opt/config/compile_state.txt
 
             # Download and run install script
+            apt-get update
             apt-get -y install unzip
             if [[ "__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.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip
@@ -191,4 +186,3 @@ resources:
             cd /opt
             chmod +x v_gw_build.sh
             ./v_gw_build.sh
-