From a1f055200ba8061417b820a4edf462a6084c1b68 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Tue, 19 Mar 2019 13:50:47 -0400 Subject: [PATCH] Remove SDNC metadata from Heat templates Change-Id: I3c3ae7850cf03b6a9e1a29035e07195703f537fd Issue-ID: INT-658 Signed-off-by: Marco Platania --- heat/vLB_CDS/vdns.env | 3 --- heat/vLB_CDS/vdns.yaml | 12 ------------ heat/vLB_CDS/vlb.env | 3 --- heat/vLB_CDS/vlb.yaml | 12 ------------ heat/vLB_CDS/vpkg.env | 3 --- heat/vLB_CDS/vpkg.yaml | 12 ------------ 6 files changed, 45 deletions(-) diff --git a/heat/vLB_CDS/vdns.env b/heat/vLB_CDS/vdns.env index e6fe0243..3c0657a8 100644 --- a/heat/vLB_CDS/vdns.env +++ b/heat/vLB_CDS/vdns.env @@ -29,9 +29,6 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer vnf_name: vLBMS - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA nb_api_version: 1.2.0 diff --git a/heat/vLB_CDS/vdns.yaml b/heat/vLB_CDS/vdns.yaml index 2b428840..d3f6e7d5 100644 --- a/heat/vLB_CDS/vdns.yaml +++ b/heat/vLB_CDS/vdns.yaml @@ -127,15 +127,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 ############# # # @@ -181,9 +172,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } user_data_format: RAW user_data: str_replace: diff --git a/heat/vLB_CDS/vlb.env b/heat/vLB_CDS/vlb.env index 52b30811..d3ca3614 100644 --- a/heat/vLB_CDS/vlb.env +++ b/heat/vLB_CDS/vlb.env @@ -36,9 +36,6 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer vnf_name: vLBMS - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA vip: 192.168.9.112 diff --git a/heat/vLB_CDS/vlb.yaml b/heat/vLB_CDS/vlb.yaml index 424bfab0..e0330df4 100644 --- a/heat/vLB_CDS/vlb.yaml +++ b/heat/vLB_CDS/vlb.yaml @@ -175,15 +175,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 ############# # # @@ -241,9 +232,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } user_data_format: RAW user_data: str_replace: diff --git a/heat/vLB_CDS/vpkg.env b/heat/vLB_CDS/vpkg.env index 1b4acd6e..4a1a7cde 100644 --- a/heat/vLB_CDS/vpkg.env +++ b/heat/vLB_CDS/vpkg.env @@ -27,9 +27,6 @@ parameters: vnf_name: vLBMS vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA pg_int: 192.168.9.109 diff --git a/heat/vLB_CDS/vpkg.yaml b/heat/vLB_CDS/vpkg.yaml index 4e635f24..e71e0bbd 100644 --- a/heat/vLB_CDS/vpkg.yaml +++ b/heat/vLB_CDS/vpkg.yaml @@ -135,15 +135,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 ############# # # @@ -186,9 +177,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } networks: - network: { get_param: public_net_id } - port: { get_resource: vpg_0_int_pktgen_private_port_0 } -- 2.16.6