HTTPS VES vLB,vLBMS and vFWs

[demo.git] / heat / vFW / base_vfw.yaml

diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index d1b74de..5ac182d 100644 (file)
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -103,7 +103,7 @@ parameters:
     description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
   vfw_int_protected_private_floating_ip:
     type: string
-    label: same value as vpg_int_unprotected_private_ip_0  
+    label: same value as vpg_int_unprotected_private_ip_0
     description: IP to inform OpenStack to enable vfw protected private port to allow packets coming from the packet generator
   vpg_int_unprotected_private_ip_0:
     type: string
@@ -172,8 +172,6 @@ parameters:
   nexus_artifact_repo:
     type: string
     description: Root URL for the Nexus repository for Maven artifacts.
-    # default values prohibited
-    #default: "https://nexus.onap.org"
   cloud_env:
     type: string
     label: Cloud environment
@@ -181,16 +179,6 @@ parameters:
   sec_group:
     type: string
     description: ONAP Security Group
-  # Unused in template
-  #sdnc_model_name:
-  #  type: string
-  #  description: SDNC Model Name metatada
-  #sdnc_model_version:
-  #  type: string
-  #  description: SDNC Model Version metatada
-  #sdnc_artifact_name:
-  #  type: string
-  #  description: SDNC Artifact Name metatada
 
 #############
 #           #
@@ -276,7 +264,6 @@ resources:
   vfw_0_int_protected_private_port_0:
     type: OS::Neutron::Port
     properties:
-      # this is a violation
       allowed_address_pairs: [{ "ip_address": { get_param: vfw_int_protected_private_floating_ip }}]
       network: { get_resource: int_protected_private_network }
       fixed_ips: [{"subnet": { get_resource: int_protected_private_subnet }, "ip_address": { get_param: vfw_int_protected_private_ip_0 }}]
@@ -315,17 +302,17 @@ resources:
       user_data:
         str_replace:
           params:
-            __dcae_collector_ip__ : { get_param: dcae_collector_ip }
-            __dcae_collector_port__ : { get_param: dcae_collector_port }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __vfw_private_ip_0__ : { get_param: vfw_int_unprotected_private_ip_0 }
-            __vfw_private_ip_1__ : { get_param: vfw_int_protected_private_ip_0 }
-            __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 }
-            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
-            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
-            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
-            __cloud_env__ : { get_param: cloud_env }
+            __dcae_collector_ip__: { get_param: dcae_collector_ip }
+            __dcae_collector_port__: { get_param: dcae_collector_port }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __vfw_private_ip_0__: { get_param: vfw_int_unprotected_private_ip_0 }
+            __vfw_private_ip_1__: { get_param: vfw_int_protected_private_ip_0 }
+            __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 }
+            __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+            __protected_private_net_cidr__: { get_param: protected_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -396,13 +383,13 @@ resources:
             __fw_ipaddr__: { get_param: vfw_int_unprotected_private_ip_0 }
             __protected_net_cidr__: { get_param: protected_private_net_cidr }
             __sink_ipaddr__: { get_param: vsn_int_protected_private_ip_0 }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __vpg_private_ip_0__ : { get_param: vpg_int_unprotected_private_ip_0 }
-            __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 }
-            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
-            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
-            __cloud_env__ : { get_param: cloud_env }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __vpg_private_ip_0__: { get_param: vpg_int_unprotected_private_ip_0 }
+            __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 }
+            __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -471,12 +458,12 @@ resources:
           params:
             __protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 }
             __unprotected_net__: { get_param: unprotected_private_net_cidr }
-            __install_script_version__ : { get_param: install_script_version }
-            __vsn_private_ip_0__ : { get_param: vsn_int_protected_private_ip_0 }
-            __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 }
-            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
-            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
-            __cloud_env__ : { get_param: cloud_env }
+            __install_script_version__: { get_param: install_script_version }
+            __vsn_private_ip_0__: { get_param: vsn_int_protected_private_ip_0 }
+            __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 }
+            __protected_private_net_cidr__: { get_param: protected_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
+            __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash