ddf28104a3
We've been using old cirros-0.4.0 for long time, and don't need to fix the version of cirros to 0.4.0. This patch is update to the latest 0.5.2. Most of the changes in this patch is replacing `image`, `hash` and `version` in TOSCA definition files. The rest of them are: * Replace images. First one is only an actual image, and rest of them are empty text files which is a trick for reducing total size in tacker repo. So, text files are not replaced, but renamed simply. * tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img * samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img * tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/Files/images/cirros-0.5.2-x86_64-disk.img * tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.5.2-x86_64-disk.img * Update functional tests verifying images. A refactor of defining package size is included. * Update devstack script, and helper scripts under `contrib` dir. * Update API references and documents describing usage of the image. Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com> Implements: blueprint update-cirros-052 Change-Id: I081b791dc986ab10f4845784b3e19dbb626e3cac
99 lines
2.2 KiB
YAML
99 lines
2.2 KiB
YAML
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
|
|
|
|
description: VirtualLinks of CP11 and CP22 will be provided by NS descriptor
|
|
node_types:
|
|
tosca.nodes.nfv.VNF1:
|
|
requirements:
|
|
- virtualLink1:
|
|
type: tosca.nodes.nfv.VL
|
|
required: true
|
|
- virtualLink2:
|
|
type: tosca.nodes.nfv.VL
|
|
required: true
|
|
capabilities:
|
|
forwader1:
|
|
type: tosca.capabilities.nfv.Forwarder
|
|
forwader2:
|
|
type: tosca.capabilities.nfv.Forwarder
|
|
|
|
topology_template:
|
|
substitution_mappings:
|
|
node_type: tosca.nodes.nfv.VNF1
|
|
requirements:
|
|
virtualLink1: [CP11, virtualLink]
|
|
virtualLink2: [CP14, virtualLink]
|
|
capabilities:
|
|
forwarder1: [CP11, forwarder]
|
|
forwarder2: [CP14, forwarder]
|
|
|
|
node_templates:
|
|
VDU1:
|
|
type: tosca.nodes.nfv.VDU.Tacker
|
|
properties:
|
|
image: cirros-0.5.2-x86_64-disk
|
|
flavor: m1.tiny
|
|
availability_zone: nova
|
|
mgmt_driver: noop
|
|
config: |
|
|
param0: key1
|
|
param1: key2
|
|
|
|
CP11:
|
|
type: tosca.nodes.nfv.CP.Tacker
|
|
properties:
|
|
management: true
|
|
anti_spoofing_protection: false
|
|
requirements:
|
|
- virtualBinding:
|
|
node: VDU1
|
|
|
|
CP12:
|
|
type: tosca.nodes.nfv.CP.Tacker
|
|
properties:
|
|
anti_spoofing_protection: false
|
|
requirements:
|
|
- virtualLink:
|
|
node: VL2
|
|
- virtualBinding:
|
|
node: VDU1
|
|
|
|
VDU2:
|
|
type: tosca.nodes.nfv.VDU.Tacker
|
|
properties:
|
|
image: cirros-0.5.2-x86_64-disk
|
|
flavor: m1.medium
|
|
availability_zone: nova
|
|
mgmt_driver: noop
|
|
config: |
|
|
param0: key1
|
|
param1: key2
|
|
|
|
CP13:
|
|
type: tosca.nodes.nfv.CP.Tacker
|
|
properties:
|
|
management: true
|
|
requirements:
|
|
- virtualLink:
|
|
node: VL1
|
|
- virtualBinding:
|
|
node: VDU2
|
|
|
|
CP14:
|
|
type: tosca.nodes.nfv.CP.Tacker
|
|
requirements:
|
|
- virtualBinding:
|
|
node: VDU2
|
|
|
|
VL1:
|
|
type: tosca.nodes.nfv.VL
|
|
properties:
|
|
network_name: net_mgmt
|
|
vendor: Tacker
|
|
|
|
VL2:
|
|
type: tosca.nodes.nfv.VL
|
|
properties:
|
|
network_name: net0
|
|
vendor: Tacker
|
|
|