Remove sdnc parameters from vFW heat template

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

diff --git a/heat/vFW_HPA/vFW/base_vfw.yaml b/heat/vFW_HPA/vFW/base_vfw.yaml
index df3765e..1506e18 100644 (file)
--- a/heat/vFW_HPA/vFW/base_vfw.yaml
+++ b/heat/vFW_HPA/vFW/base_vfw.yaml
@@ -112,24 +112,31 @@ parameters:
   vfw_private_0_port_vnic_type:
     type: string
     description: vfw port 0 vnic type (normal, direct)
+    default: normal
   vfw_private_1_port_vnic_type:
     type: string
     description: vfw port 1 vnic type (normal, direct)
+    default: normal
   vfw_private_2_port_vnic_type:
     type: string
     description: vfw port 2 vnic type (normal, direct)
+    default: normal
   vsn_private_0_port_vnic_type:
     type: string
     description: vsn port 0 vnic type (normal, direct)
+    default: normal
   vsn_private_1_port_vnic_type:
     type: string
     description: vsn port 1 vnic type (normal, direct)
+    default: normal
   vpg_private_0_port_vnic_type:
     type: string
     description: vpg port 0 vnic type (normal, direct)
+    default: normal
   vpg_private_1_port_vnic_type:
     type: string
     description: vpg port 1 vnic type (normal, direct)
+    default: normal
   vfw_name_0:
     type: string
     label: vFirewall name
@@ -185,15 +192,6 @@ parameters:
   sec_group:
     type: string
     description: ONAP Security Group
-  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
 
 #############
 #           #
@@ -282,7 +280,7 @@ resources:
         - port: { get_resource: vfw_private_0_port }
         - port: { get_resource: vfw_private_1_port }
         - port: { get_resource: vfw_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -358,7 +356,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vpg_private_0_port }
         - port: { get_resource: vpg_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -432,7 +430,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vsn_private_0_port }
         - port: { get_resource: vsn_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace: