Fix spacing issues in YAML files in heat

[demo.git] / heat / vCPE_build / vbng / build_vcpe_vbng.yaml

diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
index 59cc291..ef3e8c8 100644 (file)
--- a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
+++ b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
@@ -65,10 +65,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: Build script version number
@@ -143,21 +139,19 @@ resources:
       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 }
-            __vpp_patch_url__ : { get_param: vpp_patch_url }
-            __compile_state__ : { get_param: compile_state }
+            __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 }
+            __vpp_patch_url__: { get_param: vpp_patch_url }
+            __compile_state__: { get_param: compile_state }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           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
@@ -168,6 +162,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 [[ "__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