openstack
/
tacker
Code Issues Proposed changes

Merge "Update cirros image to 0.3.5 disk image in sample files"

This commit is contained in:
Jenkins 2017-03-22 00:29:49 +00:00 committed by Gerrit Code Review
parent 685d44d946 bfda511b05
commit 9988724969
24 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/mistral/workflows/input/create_vnfd.json
View File

@ -2,7 +2,7 @@
"body":{
"vnfd":{
"attributes":{
"vnfd":"tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca-vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.3.4-x86_64-uec\n flavor: m1.tiny\n availability_zone: nova\n mgmt_driver: noop\n config: |\n param0: key1\n param1: key2\n\n CP1:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n management: true\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL1\n - virtualBinding:\n node: VDU1\n\n CP2:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL2\n - virtualBinding:\n node: VDU1\n\n CP3:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL3\n - virtualBinding:\n node: VDU1\n\n VL1:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net_mgmt\n vendor: Tacker\n\n VL2:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net0\n vendor: Tacker\n\n VL3:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net1\n vendor: Tacker\n"
"vnfd":"tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca-vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.3.5-x86_64-disk\n flavor: m1.tiny\n availability_zone: nova\n mgmt_driver: noop\n config: |\n param0: key1\n param1: key2\n\n CP1:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n management: true\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL1\n - virtualBinding:\n node: VDU1\n\n CP2:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL2\n - virtualBinding:\n node: VDU1\n\n CP3:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL3\n - virtualBinding:\n node: VDU1\n\n VL1:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net_mgmt\n vendor: Tacker\n\n VL2:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net0\n vendor: Tacker\n\n VL3:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net1\n vendor: Tacker\n"
},
"name":"tacker-create-vnfd"
}

4
samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml
View File

@ -16,7 +16,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny
availability_zone: nova
mgmt_driver: noop
@ -38,7 +38,7 @@ topology_template:
VDU2:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.medium
availability_zone: nova
mgmt_driver: noop

2
samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB
num_cpus: 2
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova
metadata: {metering.vnf: VDU1}

4
samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB
num_cpus: 2
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova
metadata: {metering.vnf: SG1}
@ -39,7 +39,7 @@ topology_template:
mem_size: 512 MB
num_cpus: 2
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova
metadata: {metering.vnf: SG1}

2
samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml
View File

@ -18,7 +18,7 @@ topology_template:
cpu_allocation:
cpu_affinity: dedicated
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
CP1:
type: tosca.nodes.nfv.CP.Tacker

2
samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |

2
samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml
View File

@ -17,7 +17,7 @@ topology_template:
num_cpus: 2
mem_page_size: large
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
CP1:
type: tosca.nodes.nfv.CP.Tacker

2
samples/tosca-templates/vnfd/tosca-vnfd-image.yaml
View File

@ -24,7 +24,7 @@ topology_template:
artifacts:
VNFImage:
type: tosca.artifacts.Deployment.Image.VM
file: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz
file: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.tar.gz
CP1:
type: tosca.nodes.nfv.CP.Tacker

2
samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
key_name: userKey

2
samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
key_name: userKey

2
samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |

6
samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |
@ -60,7 +60,7 @@ topology_template:
VDU2:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.medium
availability_zone: nova
mgmt_driver: noop
@ -104,7 +104,7 @@ topology_template:
VDU3:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny
availability_zone: nova
mgmt_driver: noop

2
samples/tosca-templates/vnfd/tosca-vnfd-network.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny
availability_zone: nova
mgmt_driver: noop

2
samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny
availability_zone: nova
mgmt_driver: noop

2
samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml
View File

@ -17,7 +17,7 @@ topology_template:
num_cpus: 2
numa_node_count: 2
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
CP1:
type: tosca.nodes.nfv.CP.Tacker

2
samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml
View File

@ -25,7 +25,7 @@ topology_template:
vcpus: [2,3,4,5]
mem_size: 3072
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova

2
samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml
View File

@ -1,5 +1,5 @@
{
image_name: 'cirros-0.3.4-x86_64-uec',
image_name: 'cirros-0.3.5-x86_64-disk',
flavor: 'm1.tiny',
zone: 'nova',
network: 'net_mgmt',

4
samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova
flavor: m1.tiny
@ -30,7 +30,7 @@ topology_template:
VDU2:
type: tosca.nodes.nfv.VDU.Tacker
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop
availability_zone: nova
flavor: m1.tiny

2
samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
key_name: userKey

2
samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
config: |
param0: key1
param1: key2

2
samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml
View File

@ -20,7 +20,7 @@ topology_template:
thread_count: 2
core_count: 2
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
CP1:
type: tosca.nodes.nfv.CP.Tacker

2
samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml
View File

@ -26,7 +26,7 @@ topology_template:
disk_size: 1 GB
properties:
name: {get_input : vdu-name}
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |

2
samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |

2
samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB
disk_size: 1 GB
properties:
image: cirros-0.3.4-x86_64-uec
image: cirros-0.3.5-x86_64-disk
availability_zone: nova
mgmt_driver: noop
config: |