openstack
/
heat-templates
Code Issues Proposed changes

Rename Quantum resources and templates to Neutron 

Although these still work due to environment mappings, we should stop
using the old names

Change-Id: I2f08b17690405967721adbd543af5ea1d17ed4e7
This commit is contained in:
Steven Hardy 2013-10-23 22:30:46 +01:00
parent 5e9b40be2b
commit f9d687a9d7
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cfn/F17/Quantum.template → cfn/F17/Neutron.template
View File

@ -1,7 +1,7 @@
{
"AWSTemplateFormatVersion" : "2010-09-09",
"Description" : "Template to test Quantum resources",
"Description" : "Template to test Neutron resources",
"Parameters" : {
@ -9,23 +9,23 @@
"Resources" : {
"network": {
"Type": "OS::Quantum::Net",
"Type": "OS::Neutron::Net",
"Properties": {
"name": "the_network"
}
},
"unnamed_network": {
"Type": "OS::Quantum::Net"
"Type": "OS::Neutron::Net"
},
"admin_down_network": {
"Type": "OS::Quantum::Net",
"Type": "OS::Neutron::Net",
"Properties": {
"admin_state_up": false
}
},
"subnet": {
"Type": "OS::Quantum::Subnet",
"Type": "OS::Neutron::Subnet",
"Properties": {
"network_id": { "Ref" : "network" },
"ip_version": 4,
@ -35,7 +35,7 @@
},
"port": {
"Type": "OS::Quantum::Port",
"Type": "OS::Neutron::Port",
"Properties": {
"device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
"name": "port1",
@ -48,11 +48,11 @@
},
"router": {
"Type": "OS::Quantum::Router"
"Type": "OS::Neutron::Router"
},
"router_interface": {
"Type": "OS::Quantum::RouterInterface",
"Type": "OS::Neutron::RouterInterface",
"Properties": {
"router_id": { "Ref" : "router" },
"subnet_id": { "Ref" : "subnet" }

16
cfn/F17/Quantum.yaml → cfn/F17/Neutron.yaml
View File

@ -1,16 +1,16 @@
HeatTemplateFormatVersion: '2012-12-12'
Description: Template to test Quantum resources
Description: Template to test Neutron resources
Resources:
network:
Type: OS::Quantum::Net
Type: OS::Neutron::Net
Properties: {name: the_network}
unnamed_network:
Type: 'OS::Quantum::Net'
Type: 'OS::Neutron::Net'
admin_down_network:
Type: OS::Quantum::Net
Type: OS::Neutron::Net
Properties: {admin_state_up: false}
subnet:
Type: OS::Quantum::Subnet
Type: OS::Neutron::Subnet
Properties:
network_id: {Ref: network}
ip_version: 4
@ -18,7 +18,7 @@ Resources:
allocation_pools:
- {end: 10.0.3.150, start: 10.0.3.20}
port:
Type: OS::Quantum::Port
Type: OS::Neutron::Port
Properties:
device_id: d6b4d3a5-c700-476f-b609-1493dd9dadc0
name: port1
@ -27,9 +27,9 @@ Resources:
- subnet_id: {Ref: subnet}
ip_address: 10.0.3.21
router:
Type: 'OS::Quantum::Router'
Type: 'OS::Neutron::Router'
router_interface:
Type: OS::Quantum::RouterInterface
Type: OS::Neutron::RouterInterface
Properties:
router_id: {Ref: router}
subnet_id: {Ref: subnet}

8
cfn/F17/Quantum_floating.template → cfn/F17/Neutron_floating.template
View File

@ -1,7 +1,7 @@
{
"AWSTemplateFormatVersion" : "2010-09-09",
"Description" : "Template to test Quantum resources",
"Description" : "Template to test Neutron resources",
"Parameters" : {
@ -22,7 +22,7 @@
"Resources" : {
"port_floating": {
"Type": "OS::Quantum::Port",
"Type": "OS::Neutron::Port",
"Properties": {
"network_id": { "Ref" : "internal_network" },
"fixed_ips": [{
@ -33,14 +33,14 @@
},
"floating_ip": {
"Type": "OS::Quantum::FloatingIP",
"Type": "OS::Neutron::FloatingIP",
"Properties": {
"floating_network_id": { "Ref" : "external_network" }
}
},
"floating_ip_assoc": {
"Type": "OS::Quantum::FloatingIPAssociation",
"Type": "OS::Neutron::FloatingIPAssociation",
"Properties": {
"floatingip_id": { "Ref" : "floating_ip" },
"port_id": { "Ref" : "port_floating" }

12
cfn/F17/VPN_Service.template
View File

@ -1,7 +1,7 @@
{
"AWSTemplateFormatVersion" : "2010-09-09",
"Description" : "Creates new network, router, vpn sevrice and server. More details about VPN service you can find on wikipage: https://wiki.openstack.org/wiki/Quantum/VPNaaS/HowToInstall",
"Description" : "Creates new network, router, vpn sevrice and server. More details about VPN service you can find on wikipage: https://wiki.openstack.org/wiki/Neutron/VPNaaS/HowToInstall",
"Parameters" : {
@ -92,14 +92,14 @@
"Resources" : {
"Network": {
"Type": "OS::Quantum::Net",
"Type": "OS::Neutron::Net",
"Properties": {
"name": "My Network"
}
},
"Subnet": {
"Type": "OS::Quantum::Subnet",
"Type": "OS::Neutron::Subnet",
"Properties": {
"name": "My Subnet",
"network_id": { "Ref" : "Network" },
@ -115,14 +115,14 @@
},
"Router": {
"Type": "OS::Quantum::Router",
"Type": "OS::Neutron::Router",
"Properties": {
"name": "My Router"
}
},
"RouterInterface": {
"Type": "OS::Quantum::RouterInterface",
"Type": "OS::Neutron::RouterInterface",
"Properties": {
"router_id": { "Ref" : "Router" },
"subnet_id": { "Ref" : "Subnet" }
@ -130,7 +130,7 @@
},
"RouterGateway": {
"Type": "OS::Quantum::RouterGateway",
"Type": "OS::Neutron::RouterGateway",
"Properties": {
"router_id": { "Ref" : "Router" },
"network_id": { "Ref" : "ExternalNetwork" }

6
cfn/F17/WordPress_Single_Instance_With_Quantum.template → cfn/F17/WordPress_Single_Instance_With_Neutron.template
View File

@ -89,11 +89,11 @@
"Resources" : {
"network": {
"Type": "OS::Quantum::Net"
"Type": "OS::Neutron::Net"
},
"subnet": {
"Type": "OS::Quantum::Subnet",
"Type": "OS::Neutron::Subnet",
"Properties": {
"network_id": { "Ref" : "network" },
"ip_version": 4,
@ -103,7 +103,7 @@
},
"port": {
"Type": "OS::Quantum::Port",
"Type": "OS::Neutron::Port",
"Properties": {
"device_id": { "Ref" : "WebServer" },
"network_id": { "Ref" : "network" },