X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Finfra%2Fbase_vcpe_infra.yaml;h=9d26bb679ed0335471680c907d7bf74240d0f862;hb=314c0c1e45bc6a4c1ae0e7c030ebbf51b80abb35;hp=9f3bf2749279a66744fe29d55617d230be27d150;hpb=8ae23f9f45c8a481bec5238ecc759ac0c23538a6;p=demo.git

diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml
index 9f3bf274..9d26bb67 100644
--- a/heat/vCPE/infra/base_vcpe_infra.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer)
+description: Heat template to deploy vCPE Infrastructure emlements (vAAA, vDHCP, vDNS_DHCP, webServer)
 
 ##############
 #            #
@@ -108,7 +108,7 @@ parameters:
   vweb_private_ip_0:
     type: string
     label: vWEB private IP address towards the CPE_PUBLIC private network
-    description: Private IP address that is assigned to the vWEB to communicate with the vGWs 
+    description: Private IP address that is assigned to the vWEB to communicate with the vGWs
   vweb_private_ip_1:
     type: string
     label: vWEB private IP address towards the ONAP management network
@@ -128,7 +128,7 @@ parameters:
   vweb_name_0:
     type: string
     label: vWEB name
-    description: Name of the vWEB 
+    description: Name of the vWEB
   vnf_id:
     type: string
     label: VNF ID
@@ -148,11 +148,11 @@ parameters:
   mr_ip_addr:
     type: string
     label: Message Router IP address
-    description: IP address of the Message Router that for vDHCP configuration 
+    description: IP address of the Message Router that for vDHCP configuration
   mr_ip_port:
     type: string
-    label: Message Router Port 
-    description: IP port of the Message Router that for vDHCP configuration 
+    label: Message Router Port
+    description: IP port of the Message Router that for vDHCP configuration
   key_name:
     type: string
     label: Key pair name
@@ -239,9 +239,9 @@ resources:
             __oam_ipaddr__: { get_param: vaaa_private_ip_1 }
             __oam_cidr__: { get_param: onap_private_net_cidr }
             __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -299,13 +299,13 @@ resources:
       user_data:
         str_replace:
           params:
-            __oam_ipaddr__ : { get_param: vdns_private_ip_1 }
+            __oam_ipaddr__: { get_param: vdns_private_ip_1 }
             __cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }
             __oam_cidr__: { get_param: onap_private_net_cidr }
             __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -361,15 +361,15 @@ resources:
       user_data:
         str_replace:
           params:
-            __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 }
-            __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 }
-            __oam_cidr__ : { get_param: onap_private_net_cidr }
-            __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }
-            __mr_ip_addr__ : { get_param: mr_ip_addr }
-            __mr_ip_port__ : { get_param: mr_ip_port }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
+            __oam_ipaddr__: { get_param: vdhcp_private_ip_1 }
+            __cpe_signal_ipaddr__: { get_param: vdhcp_private_ip_0 }
+            __oam_cidr__: { get_param: onap_private_net_cidr }
+            __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __mr_ip_port__: { get_param: mr_ip_port }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -427,13 +427,13 @@ resources:
       user_data:
         str_replace:
           params:
-            __oam_ipaddr__ : { get_param: vweb_private_ip_1 }
+            __oam_ipaddr__: { get_param: vweb_private_ip_1 }
             __cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }
             __oam_cidr__: { get_param: onap_private_net_cidr }
             __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash