diff options
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/Makefile | 12 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/MANIFEST.json | 10 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/base_template.env | 9 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/base_template.yaml | 19 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vfw.env | 28 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vfw.yaml | 150 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vpkg.env | 23 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vpkg.yaml | 127 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vsn.env | 22 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/base/vsn.yaml | 121 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/helm/README.txt | 2 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml | 2 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml | 2 | ||||
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/tools/tail_config | 13 |
14 files changed, 31 insertions, 509 deletions
diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile index 72e93f2a..5cae204b 100644 --- a/heat/vFW_CNF_CDS/templates/Makefile +++ b/heat/vFW_CNF_CDS/templates/Makefile @@ -1,15 +1,15 @@ .PHONY: all clean helm base cba clean_all -CSAR_NAME ?= vfw_k8s_demo -CBA_NAME ?= vFW_CDS_CNF +ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo +CBA_NAME ?= CBA clean_all: $(MAKE) clean $(MAKE) all +#Can't use .csar extension or SDC will panic all: csar/ helm base cba - #Can't use .csar extension or SDC will panic - cd csar/ && zip -r $(CSAR_NAME).zip . - mv csar/$(CSAR_NAME).zip . + cd csar/ && zip -r $(ONBOARDING_PACKAGE_NAME).zip . + mv csar/$(ONBOARDING_PACKAGE_NAME).zip . helm: csar/ make -C helm @@ -27,4 +27,4 @@ csar/: clean: rm -rf csar/ - rm -f $(CSAR_NAME).zip + rm -f $(ONBOARDING_PACKAGE_NAME).zip diff --git a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json index cd971cd6..08f65e75 100644 --- a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json +++ b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json @@ -3,7 +3,7 @@ "description": "", "data": [ { - "file": "vFW_CDS_CNF.zip", + "file": "CBA.zip", "type": "CONTROLLER_BLUEPRINT_ARCHIVE" }, { @@ -19,7 +19,7 @@ }, { "file": "base_template_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS" + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" }, { "file": "vfw.yaml", @@ -34,7 +34,7 @@ }, { "file": "vfw_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS" + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" }, { "file": "vpkg.yaml", @@ -49,7 +49,7 @@ }, { "file": "vpkg_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS" + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" }, { "file": "vsn.yaml", @@ -64,7 +64,7 @@ }, { "file": "vsn_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS" + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" } ] } diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.env b/heat/vFW_CNF_CDS/templates/base/base_template.env index 53735a9f..16d0a6aa 100644 --- a/heat/vFW_CNF_CDS/templates/base/base_template.env +++ b/heat/vFW_CNF_CDS/templates/base/base_template.env @@ -1,7 +1,4 @@ parameters: - int_private1_net_cidr: 192.168.10.0/24 - int_private2_net_cidr: 192.168.20.0/24 - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - vnf_name: vFW_NextGen - vnf_id: 12345 - vf_module_id: 123456 + vnf_name: vFW_CDS_CNF + vnf_id: vFirewall_demo_app + vf_module_id: vFirewallNet diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml index fdf1625c..fbcf1810 100644 --- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml +++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml @@ -3,6 +3,7 @@ #==================LICENSE_START========================================== # # +# Copyright © 2020 Samsung Electronics # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,18 +34,6 @@ description: Dummy base heat template for vFW usecase ############## parameters: - int_private1_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - int_private2_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - pub_key: - type: string - label: Public key - description: Public key to be installed on the compute instance vnf_name: type: string description: VNF_NAME @@ -67,12 +56,6 @@ resources: dummy: type: OS::Heat::None properties: - int_private1_net_cidr: - get_param: int_private1_net_cidr - int_private2_net_cidr: - get_param: int_private2_net_cidr - pub_key: - get_param: pub_key vnf_name: get_param: vnf_name vnf_id: diff --git a/heat/vFW_CNF_CDS/templates/base/vfw.env b/heat/vFW_CNF_CDS/templates/base/vfw.env index 42dccf9c..a43e40f0 100644 --- a/heat/vFW_CNF_CDS/templates/base/vfw.env +++ b/heat/vFW_CNF_CDS/templates/base/vfw.env @@ -1,30 +1,4 @@ parameters: - vfw_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404) - vfw_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - int_private1_net_id: zdfw1fwl01_unprotected - int_private1_subnet_id: zdfw1fwl01_unprotected_sub - int_private1_net_cidr: 192.168.10.0/24 - int_private2_net_id: zdfw1fwl01_protected - int_private2_subnet_id: zdfw1fwl01_protected_sub - int_private2_net_cidr: 192.168.20.0/24 - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_net_cidr: 10.0.0.0/16 - vfw_int_private1_ip_0: 192.168.10.100 - vfw_int_private2_ip_0: 192.168.20.100 - vfw_onap_private_ip_0: 10.0.100.1 - #vpg_private_ip_0: 192.168.10.200 - vfw_int_private2_floating_ip: 192.168.10.200 - vfw_name_0: zdfw1fwl01fwl01 vnf_id: vFirewall_demo_app - vnf_name: vFW_NextGen + vnf_name: vFW_CDS_CNF vf_module_id: vFirewallCL - dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 - demo_artifacts_version: 1.6.0-SNAPSHOT - install_script_version: 1.6.0-SNAPSHOT - key_name: vfw_key - cloud_env: PUT openstack OR rackspace HERE - sec_group: PUT THE ONAP SECURITY GROUP HERE - nexus_artifact_repo: https://nexus.onap.org diff --git a/heat/vFW_CNF_CDS/templates/base/vfw.yaml b/heat/vFW_CNF_CDS/templates/base/vfw.yaml index c21988db..a1a434e2 100644 --- a/heat/vFW_CNF_CDS/templates/base/vfw.yaml +++ b/heat/vFW_CNF_CDS/templates/base/vfw.yaml @@ -3,6 +3,7 @@ #==================LICENSE_START========================================== # # +# Copyright © 2020 Samsung Electronics # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,74 +34,6 @@ description: Dummy heat template for vFirewall ############## parameters: - vfw_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vfw_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - int_private1_net_id: - type: string - label: Unprotected private network name or ID - description: Private network that connects vPacketGenerator with vFirewall - int_private1_subnet_id: - type: string - label: Unprotected private subnetwork name or ID - description: Private subnetwork of the protected network - int_private1_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - int_private2_net_id: - type: string - label: Protected private network name or ID - description: Private network that connects vFirewall with vSink - int_private2_subnet_id: - type: string - label: Protected private subnetwork name or ID - description: Private subnetwork of the unprotected network - int_private2_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - onap_private_net_id: - type: string - label: ONAP management network name or ID - description: Private network that connects ONAP components and the VNF - onap_private_subnet_id: - type: string - label: ONAP management sub-network name or ID - description: Private sub-network that connects ONAP components and the VNF - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vfw_int_private1_ip_0: - type: string - label: vFirewall private IP address towards the unprotected network - description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator - vfw_int_private2_ip_0: - type: string - label: vFirewall private IP address towards the protected network - description: Private IP address that is assigned to the vFirewall to communicate with the vSink - vfw_onap_private_ip_0: - type: string - label: vFirewall private IP address towards the ONAP management network - description: Private IP address that is assigned to the vFirewall to communicate with ONAP components - vfw_int_private2_floating_ip: - type: string - label: vPacketGenerator private IP address towards the unprotected network - description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall - vfw_name_0: - type: string - label: vFirewall name - description: Name of the vFirewall vnf_id: type: string label: VNF ID @@ -113,37 +46,6 @@ parameters: type: string label: VF Module ID description: The VF Module ID is provided by ONAP - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - install_script_version: - type: string - label: Installation script version number - description: Version number of the scripts that install the vFW demo app - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - nexus_artifact_repo: - type: string - description: Root URL for the Nexus repository for Maven artifacts. - # default: "https://nexus.onap.org" - cloud_env: - type: string - label: Cloud environment - description: Cloud environment (e.g., openstack, rackspace) - sec_group: - type: string - description: ONAP Security Group ############# @@ -156,59 +58,9 @@ resources: dummy: type: OS::Heat::None properties: - vfw_image_name: - get_param: vfw_image_name - vfw_flavor_name: - get_param: vfw_flavor_name - public_net_id: - get_param: public_net_id - int_private1_net_id: - get_param: int_private1_net_id - int_private1_subnet_id: - get_param: int_private1_subnet_id - int_private1_net_cidr: - get_param: int_private1_net_cidr - int_private2_net_id: - get_param: int_private2_net_id - int_private2_subnet_id: - get_param: int_private2_subnet_id - int_private2_net_cidr: - get_param: int_private2_net_cidr - onap_private_net_id: - get_param: onap_private_net_id - onap_private_subnet_id: - get_param: onap_private_subnet_id - onap_private_net_cidr: - get_param: onap_private_net_cidr - vfw_int_private1_ip_0: - get_param: vfw_int_private1_ip_0 - vfw_int_private2_ip_0: - get_param: vfw_int_private2_ip_0 - vfw_onap_private_ip_0: - get_param: vfw_onap_private_ip_0 - vfw_int_private2_floating_ip: - get_param: vfw_int_private2_floating_ip - vfw_name_0: - get_param: vfw_name_0 vnf_id: get_param: vnf_id vnf_name: get_param: vnf_name vf_module_id: get_param: vf_module_id - dcae_collector_ip: - get_param: dcae_collector_ip - dcae_collector_port: - get_param: dcae_collector_port - key_name: - get_param: key_name - install_script_version: - get_param: install_script_version - demo_artifacts_version: - get_param: demo_artifacts_version - nexus_artifact_repo: - get_param: nexus_artifact_repo - cloud_env: - get_param: cloud_env - sec_group: - get_param: sec_group diff --git a/heat/vFW_CNF_CDS/templates/base/vpkg.env b/heat/vFW_CNF_CDS/templates/base/vpkg.env index 23f7817e..13d9e858 100644 --- a/heat/vFW_CNF_CDS/templates/base/vpkg.env +++ b/heat/vFW_CNF_CDS/templates/base/vpkg.env @@ -1,25 +1,4 @@ parameters: - vpg_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404) - vpg_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - int_private1_net_id: zdfw1fwl01_unprotected - int_private1_subnet_id: zdfw1fwl01_unprotected_sub - int_private1_net_cidr: 192.168.10.0/24 - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_net_cidr: 10.0.0.0/16 - int_private2_net_cidr: 192.168.20.0/24 - vfw_int_private1_ip_0: 192.168.10.100 - vpg_int_private1_ip_0: 192.168.10.200 - vpg_onap_private_ip_0: 10.0.100.2 - vsn_int_private2_ip_0: 192.168.20.250 - vpg_name_0: zdfw1fwl01pgn01 - vnf_name: vFW_NextGen + vnf_name: vFW_CDS_CNF vnf_id: vPacketGen_demo_app vf_module_id: vTrafficPNG - demo_artifacts_version: 1.6.0-SNAPSHOT - install_script_version: 1.6.0-SNAPSHOT - key_name: vfw_key - cloud_env: PUT openstack OR rackspace HERE - sec_group: PUT THE ONAP SECURITY GROUP HERE - nexus_artifact_repo: https://nexus.onap.org
\ No newline at end of file diff --git a/heat/vFW_CNF_CDS/templates/base/vpkg.yaml b/heat/vFW_CNF_CDS/templates/base/vpkg.yaml index 6a23da0a..1fdabc82 100644 --- a/heat/vFW_CNF_CDS/templates/base/vpkg.yaml +++ b/heat/vFW_CNF_CDS/templates/base/vpkg.yaml @@ -3,6 +3,7 @@ #==================LICENSE_START========================================== # # +# Copyright © 2020 Samsung Electronics # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,66 +34,6 @@ description: Dummy heat template for vPacketgen ############## parameters: - vpg_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vpg_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - int_private1_net_id: - type: string - label: Unprotected private network name or ID - description: Private network that connects vPacketGenerator with vFirewall - int_private1_subnet_id: - type: string - label: Unprotected private sub-network name or ID - description: Private subnetwork for the unprotected network - int_private1_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - int_private2_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - onap_private_net_id: - type: string - label: ONAP management network name or ID - description: Private network that connects ONAP components and the VNF - onap_private_subnet_id: - type: string - label: ONAP management sub-network name or ID - description: Private sub-network that connects ONAP components and the VNF - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vfw_int_private1_ip_0: - type: string - label: vFirewall private IP address towards the unprotected network - description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator - vsn_int_private2_ip_0: - type: string - label: vSink private IP address towards the protected network - description: Private IP address that is assigned to the vSink to communicate with the vFirewall - vpg_int_private1_ip_0: - type: string - label: vPacketGenerator private IP address towards the unprotected network - description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall - vpg_onap_private_ip_0: - type: string - label: vPacketGenerator private IP address towards the ONAP management network - description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components - vpg_name_0: - type: string - label: vPacketGenerator name - description: Name of the vPacketGenerator vnf_name: type: string label: VNF NAME @@ -105,30 +46,6 @@ parameters: type: string label: VF Module ID description: The VF Module ID is provided by ONAP - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - install_script_version: - type: string - label: Installation script version number - description: Version number of the scripts that install the vFW demo app - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - nexus_artifact_repo: - type: string - description: Root URL for the Nexus repository for Maven artifacts. - # default: "https://nexus.onap.org" - cloud_env: - type: string - label: Cloud environment - description: Cloud environment (e.g., openstack, rackspace) - sec_group: - type: string - description: ONAP Security Group - ############# # # @@ -140,51 +57,9 @@ resources: dummy: type: OS::Heat::None properties: - vpg_image_name: - get_param: vpg_image_name - vpg_flavor_name: - get_param: vpg_flavor_name - public_net_id: - get_param: public_net_id - int_private1_net_id: - get_param: int_private1_net_id - int_private1_subnet_id: - get_param: int_private1_subnet_id - int_private1_net_cidr: - get_param: int_private1_net_cidr - int_private2_net_cidr: - get_param: int_private2_net_cidr - onap_private_net_id: - get_param: onap_private_net_id - onap_private_subnet_id: - get_param: onap_private_subnet_id - onap_private_net_cidr: - get_param: onap_private_net_cidr - vfw_int_private1_ip_0: - get_param: vfw_int_private1_ip_0 - vsn_int_private2_ip_0: - get_param: vsn_int_private2_ip_0 - vpg_int_private1_ip_0: - get_param: vpg_int_private1_ip_0 - vpg_onap_private_ip_0: - get_param: vpg_onap_private_ip_0 - vpg_name_0: - get_param: vpg_name_0 vnf_name: get_param: vnf_name vnf_id: get_param: vnf_id vf_module_id: get_param: vf_module_id - key_name: - get_param: key_name - install_script_version: - get_param: install_script_version - demo_artifacts_version: - get_param: demo_artifacts_version - nexus_artifact_repo: - get_param: nexus_artifact_repo - cloud_env: - get_param: cloud_env - sec_group: - get_param: sec_group diff --git a/heat/vFW_CNF_CDS/templates/base/vsn.env b/heat/vFW_CNF_CDS/templates/base/vsn.env index a0b2ec9c..34e79ebc 100644 --- a/heat/vFW_CNF_CDS/templates/base/vsn.env +++ b/heat/vFW_CNF_CDS/templates/base/vsn.env @@ -1,24 +1,4 @@ parameters: - vsn_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404) - vsn_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - int_private1_net_cidr: 192.168.10.0/24 - int_private2_net_id: zdfw1fwl01_protected - int_private2_subnet_id: zdfw1fwl01_protected_sub - int_private2_net_cidr: 192.168.20.0/24 - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_net_cidr: 10.0.0.0/16 - vfw_int_private2_ip_0: 192.168.20.100 - vsn_int_private2_ip_0: 192.168.20.250 - vsn_onap_private_ip_0: 10.0.100.3 - vsn_name_0: zdfw1fwl01snk01 vnf_id: vSink_demo_app vf_module_id: vFirewallCL - vnf_name: vFW_NextGen - #demo_artifacts_version: 1.6.0-SNAPSHOT - install_script_version: 1.6.0-SNAPSHOT - key_name: vfw_key - cloud_env: PUT openstack OR rackspace HERE - sec_group: PUT THE ONAP SECURITY GROUP HERE - nexus_artifact_repo: https://nexus.onap.org
\ No newline at end of file + vnf_name: vFW_CDS_CNF diff --git a/heat/vFW_CNF_CDS/templates/base/vsn.yaml b/heat/vFW_CNF_CDS/templates/base/vsn.yaml index de898a96..0667e5c4 100644 --- a/heat/vFW_CNF_CDS/templates/base/vsn.yaml +++ b/heat/vFW_CNF_CDS/templates/base/vsn.yaml @@ -3,6 +3,7 @@ #==================LICENSE_START========================================== # # +# Copyright © 2020 Samsung Electronics # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,62 +34,6 @@ description: Dummy heat template for vSink ############## parameters: - vsn_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vsn_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - int_private1_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - int_private2_net_id: - type: string - label: Protected private network name or ID - description: Private network that connects vFirewall with vSink - int_private2_subnet_id: - type: string - label: Protected private subnetwork name or ID - description: Private subnetwork of the unprotected network - int_private2_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - onap_private_net_id: - type: string - label: ONAP management network name or ID - description: Private network that connects ONAP components and the VNF - onap_private_subnet_id: - type: string - label: ONAP management sub-network name or ID - description: Private sub-network that connects ONAP components and the VNF - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vfw_int_private2_ip_0: - type: string - label: vFirewall private IP address towards the protected network - description: Private IP address that is assigned to the vFirewall to communicate with the vSink - vsn_int_private2_ip_0: - type: string - label: vSink private IP address towards the protected network - description: Private IP address that is assigned to the vSink to communicate with the vFirewall - vsn_onap_private_ip_0: - type: string - label: vSink private IP address towards the ONAP management network - description: Private IP address that is assigned to the vSink to communicate with ONAP components - vsn_name_0: - type: string - label: vSink name - description: Name of the vSink vnf_id: type: string label: VNF ID @@ -101,30 +46,6 @@ parameters: type: string label: VF Module ID description: The VF Module ID is provided by ONAP - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - install_script_version: - type: string - label: Installation script version number - description: Version number of the scripts that install the vFW demo app - #demo_artifacts_version: - # type: string - # label: Artifacts version used in demo vnfs - # description: Artifacts (jar, tar.gz) version used in demo vnfs - nexus_artifact_repo: - type: string - description: Root URL for the Nexus repository for Maven artifacts. - # default: "https://nexus.onap.org" - cloud_env: - type: string - label: Cloud environment - description: Cloud environment (e.g., openstack, rackspace) - sec_group: - type: string - description: ONAP Security Group - ############# # # @@ -137,49 +58,9 @@ resources: dummy: type: OS::Heat::None properties: - vsn_image_name: - get_param: vsn_image_name - vsn_flavor_name: - get_param: vsn_flavor_name - public_net_id: - get_param: public_net_id - int_private1_net_cidr: - get_param: int_private1_net_cidr - int_private2_net_id: - get_param: int_private2_net_id - int_private2_subnet_id: - get_param: int_private2_subnet_id - int_private2_net_cidr: - get_param: int_private2_net_cidr - onap_private_net_id: - get_param: onap_private_net_id - onap_private_subnet_id: - get_param: onap_private_subnet_id - onap_private_net_cidr: - get_param: onap_private_net_cidr - vfw_int_private2_ip_0: - get_param: vfw_int_private2_ip_0 - vsn_int_private2_ip_0: - get_param: vsn_int_private2_ip_0 - vsn_onap_private_ip_0: - get_param: vsn_onap_private_ip_0 - vsn_name_0: - get_param: vsn_name_0 vnf_id: get_param: vnf_id vnf_name: get_param: vnf_name vf_module_id: get_param: vf_module_id - key_name: - get_param: key_name - install_script_version: - get_param: install_script_version - #demo_artifacts_version: - # get_param: demo_artifacts_version - nexus_artifact_repo: - get_param: nexus_artifact_repo - cloud_env: - get_param: cloud_env - sec_group: - get_param: sec_group diff --git a/heat/vFW_CNF_CDS/templates/helm/README.txt b/heat/vFW_CNF_CDS/templates/helm/README.txt index bd7626b4..63429e91 100644 --- a/heat/vFW_CNF_CDS/templates/helm/README.txt +++ b/heat/vFW_CNF_CDS/templates/helm/README.txt @@ -1,4 +1,4 @@ -Helm content of csar package +Helm content of onboarding package To create necessary archives, please ensure you have [helm] and [make] installed first. diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml index 7d2ecc13..a9994425 100644 --- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml +++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.vpg_name_0 }}-management-api + name: "{{ .Values.vpg_name_0 }}-mgmt" labels: vnf-name: {{ .Values.vnf_name }} vf-module-name: {{ .Values.vpg_name_0 }} diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml index e93a8c9a..a046531f 100644 --- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml +++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.vsn_name_0 }}-darkstat-ui + name: "{{ .Values.vsn_name_0 }}-ui" labels: vnf-name: {{ .Values.vnf_name }} vf-module-name: {{ .Values.vsn_name_0 }} diff --git a/heat/vFW_CNF_CDS/templates/tools/tail_config b/heat/vFW_CNF_CDS/templates/tools/tail_config index ca19623c..ca49793c 100644 --- a/heat/vFW_CNF_CDS/templates/tools/tail_config +++ b/heat/vFW_CNF_CDS/templates/tools/tail_config @@ -1,17 +1,18 @@ -#!/bin/bash +#!/bin/false NAMESPACE="onap" TAILS=( - "/app/logs/apih/metrics.log so" + "/app/logs/apih/debug.log so" + "/app/logs/apih/error.log so" "/app/logs/bpmn/debug.log so-bpmn-infra" - "/app/logs/vnfm-adapter/debug.log so-vnfm-adapter" + "/app/logs/openstack/error.log so-openstack-adapter" + "/app/logs/openstack/debug.log so-openstack-adapter" "/var/log/onap/sdnc/karaf.log sdnc" - "/tmp/app.out network-name-gen" + "POD_LOG network-name-gen" "POD_LOG cds-blueprints-processor" "POD_LOG multicloud multicloud" "POD_LOG multicloud-k8s multicloud-k8s" "POD_LOG multicloud-k8s framework-artifactbroker" - "/app/logs/openstack/error.log so-openstack-adapter" - "/app/logs/openstack/debug.log so-openstack-adapter" + "POD_LOG msb-iag msb-iag" ) |