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:
parent
5e9b40be2b
commit
f9d687a9d7
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"AWSTemplateFormatVersion" : "2010-09-09",
|
"AWSTemplateFormatVersion" : "2010-09-09",
|
||||||
|
|
||||||
"Description" : "Template to test Quantum resources",
|
"Description" : "Template to test Neutron resources",
|
||||||
|
|
||||||
"Parameters" : {
|
"Parameters" : {
|
||||||
|
|
||||||
@ -9,23 +9,23 @@
|
|||||||
|
|
||||||
"Resources" : {
|
"Resources" : {
|
||||||
"network": {
|
"network": {
|
||||||
"Type": "OS::Quantum::Net",
|
"Type": "OS::Neutron::Net",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"name": "the_network"
|
"name": "the_network"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"unnamed_network": {
|
"unnamed_network": {
|
||||||
"Type": "OS::Quantum::Net"
|
"Type": "OS::Neutron::Net"
|
||||||
},
|
},
|
||||||
"admin_down_network": {
|
"admin_down_network": {
|
||||||
"Type": "OS::Quantum::Net",
|
"Type": "OS::Neutron::Net",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"admin_state_up": false
|
"admin_state_up": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"subnet": {
|
"subnet": {
|
||||||
"Type": "OS::Quantum::Subnet",
|
"Type": "OS::Neutron::Subnet",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"network_id": { "Ref" : "network" },
|
"network_id": { "Ref" : "network" },
|
||||||
"ip_version": 4,
|
"ip_version": 4,
|
||||||
@ -35,7 +35,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"port": {
|
"port": {
|
||||||
"Type": "OS::Quantum::Port",
|
"Type": "OS::Neutron::Port",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
|
"device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
|
||||||
"name": "port1",
|
"name": "port1",
|
||||||
@ -48,11 +48,11 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"router": {
|
"router": {
|
||||||
"Type": "OS::Quantum::Router"
|
"Type": "OS::Neutron::Router"
|
||||||
},
|
},
|
||||||
|
|
||||||
"router_interface": {
|
"router_interface": {
|
||||||
"Type": "OS::Quantum::RouterInterface",
|
"Type": "OS::Neutron::RouterInterface",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"router_id": { "Ref" : "router" },
|
"router_id": { "Ref" : "router" },
|
||||||
"subnet_id": { "Ref" : "subnet" }
|
"subnet_id": { "Ref" : "subnet" }
|
@ -1,16 +1,16 @@
|
|||||||
HeatTemplateFormatVersion: '2012-12-12'
|
HeatTemplateFormatVersion: '2012-12-12'
|
||||||
Description: Template to test Quantum resources
|
Description: Template to test Neutron resources
|
||||||
Resources:
|
Resources:
|
||||||
network:
|
network:
|
||||||
Type: OS::Quantum::Net
|
Type: OS::Neutron::Net
|
||||||
Properties: {name: the_network}
|
Properties: {name: the_network}
|
||||||
unnamed_network:
|
unnamed_network:
|
||||||
Type: 'OS::Quantum::Net'
|
Type: 'OS::Neutron::Net'
|
||||||
admin_down_network:
|
admin_down_network:
|
||||||
Type: OS::Quantum::Net
|
Type: OS::Neutron::Net
|
||||||
Properties: {admin_state_up: false}
|
Properties: {admin_state_up: false}
|
||||||
subnet:
|
subnet:
|
||||||
Type: OS::Quantum::Subnet
|
Type: OS::Neutron::Subnet
|
||||||
Properties:
|
Properties:
|
||||||
network_id: {Ref: network}
|
network_id: {Ref: network}
|
||||||
ip_version: 4
|
ip_version: 4
|
||||||
@ -18,7 +18,7 @@ Resources:
|
|||||||
allocation_pools:
|
allocation_pools:
|
||||||
- {end: 10.0.3.150, start: 10.0.3.20}
|
- {end: 10.0.3.150, start: 10.0.3.20}
|
||||||
port:
|
port:
|
||||||
Type: OS::Quantum::Port
|
Type: OS::Neutron::Port
|
||||||
Properties:
|
Properties:
|
||||||
device_id: d6b4d3a5-c700-476f-b609-1493dd9dadc0
|
device_id: d6b4d3a5-c700-476f-b609-1493dd9dadc0
|
||||||
name: port1
|
name: port1
|
||||||
@ -27,9 +27,9 @@ Resources:
|
|||||||
- subnet_id: {Ref: subnet}
|
- subnet_id: {Ref: subnet}
|
||||||
ip_address: 10.0.3.21
|
ip_address: 10.0.3.21
|
||||||
router:
|
router:
|
||||||
Type: 'OS::Quantum::Router'
|
Type: 'OS::Neutron::Router'
|
||||||
router_interface:
|
router_interface:
|
||||||
Type: OS::Quantum::RouterInterface
|
Type: OS::Neutron::RouterInterface
|
||||||
Properties:
|
Properties:
|
||||||
router_id: {Ref: router}
|
router_id: {Ref: router}
|
||||||
subnet_id: {Ref: subnet}
|
subnet_id: {Ref: subnet}
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"AWSTemplateFormatVersion" : "2010-09-09",
|
"AWSTemplateFormatVersion" : "2010-09-09",
|
||||||
|
|
||||||
"Description" : "Template to test Quantum resources",
|
"Description" : "Template to test Neutron resources",
|
||||||
|
|
||||||
"Parameters" : {
|
"Parameters" : {
|
||||||
|
|
||||||
@ -22,7 +22,7 @@
|
|||||||
"Resources" : {
|
"Resources" : {
|
||||||
|
|
||||||
"port_floating": {
|
"port_floating": {
|
||||||
"Type": "OS::Quantum::Port",
|
"Type": "OS::Neutron::Port",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"network_id": { "Ref" : "internal_network" },
|
"network_id": { "Ref" : "internal_network" },
|
||||||
"fixed_ips": [{
|
"fixed_ips": [{
|
||||||
@ -33,14 +33,14 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"floating_ip": {
|
"floating_ip": {
|
||||||
"Type": "OS::Quantum::FloatingIP",
|
"Type": "OS::Neutron::FloatingIP",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"floating_network_id": { "Ref" : "external_network" }
|
"floating_network_id": { "Ref" : "external_network" }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"floating_ip_assoc": {
|
"floating_ip_assoc": {
|
||||||
"Type": "OS::Quantum::FloatingIPAssociation",
|
"Type": "OS::Neutron::FloatingIPAssociation",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"floatingip_id": { "Ref" : "floating_ip" },
|
"floatingip_id": { "Ref" : "floating_ip" },
|
||||||
"port_id": { "Ref" : "port_floating" }
|
"port_id": { "Ref" : "port_floating" }
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"AWSTemplateFormatVersion" : "2010-09-09",
|
"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" : {
|
"Parameters" : {
|
||||||
|
|
||||||
@ -92,14 +92,14 @@
|
|||||||
"Resources" : {
|
"Resources" : {
|
||||||
|
|
||||||
"Network": {
|
"Network": {
|
||||||
"Type": "OS::Quantum::Net",
|
"Type": "OS::Neutron::Net",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"name": "My Network"
|
"name": "My Network"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"Subnet": {
|
"Subnet": {
|
||||||
"Type": "OS::Quantum::Subnet",
|
"Type": "OS::Neutron::Subnet",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"name": "My Subnet",
|
"name": "My Subnet",
|
||||||
"network_id": { "Ref" : "Network" },
|
"network_id": { "Ref" : "Network" },
|
||||||
@ -115,14 +115,14 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"Router": {
|
"Router": {
|
||||||
"Type": "OS::Quantum::Router",
|
"Type": "OS::Neutron::Router",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"name": "My Router"
|
"name": "My Router"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"RouterInterface": {
|
"RouterInterface": {
|
||||||
"Type": "OS::Quantum::RouterInterface",
|
"Type": "OS::Neutron::RouterInterface",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"router_id": { "Ref" : "Router" },
|
"router_id": { "Ref" : "Router" },
|
||||||
"subnet_id": { "Ref" : "Subnet" }
|
"subnet_id": { "Ref" : "Subnet" }
|
||||||
@ -130,7 +130,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"RouterGateway": {
|
"RouterGateway": {
|
||||||
"Type": "OS::Quantum::RouterGateway",
|
"Type": "OS::Neutron::RouterGateway",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"router_id": { "Ref" : "Router" },
|
"router_id": { "Ref" : "Router" },
|
||||||
"network_id": { "Ref" : "ExternalNetwork" }
|
"network_id": { "Ref" : "ExternalNetwork" }
|
||||||
|
@ -89,11 +89,11 @@
|
|||||||
"Resources" : {
|
"Resources" : {
|
||||||
|
|
||||||
"network": {
|
"network": {
|
||||||
"Type": "OS::Quantum::Net"
|
"Type": "OS::Neutron::Net"
|
||||||
},
|
},
|
||||||
|
|
||||||
"subnet": {
|
"subnet": {
|
||||||
"Type": "OS::Quantum::Subnet",
|
"Type": "OS::Neutron::Subnet",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"network_id": { "Ref" : "network" },
|
"network_id": { "Ref" : "network" },
|
||||||
"ip_version": 4,
|
"ip_version": 4,
|
||||||
@ -103,7 +103,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"port": {
|
"port": {
|
||||||
"Type": "OS::Quantum::Port",
|
"Type": "OS::Neutron::Port",
|
||||||
"Properties": {
|
"Properties": {
|
||||||
"device_id": { "Ref" : "WebServer" },
|
"device_id": { "Ref" : "WebServer" },
|
||||||
"network_id": { "Ref" : "network" },
|
"network_id": { "Ref" : "network" },
|
Loading…
Reference in New Issue
Block a user