openstack/deb-murano
Code Issues Proposed changes

Merge "Fix name of the properties for networking resources"

Browse Source
This commit is contained in:
Jenkins 2015-01-20 14:15:45 +00:00 committed by Gerrit Code Review
commit e01ba58094
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/io.murano/Classes/resources/Instance.yaml
View File

@ -183,9 +183,9 @@ Methods:
$portname:
type: 'OS::Neutron::Port'
properties:
network_id: $netRef
network: $netRef
fixed_ips:
- subnet_id: $subnetRef
- subnet: $subnetRef
security_groups:
- get_resource: $securityGroupName
$.name:

6
meta/io.murano/Classes/resources/NeutronNetwork.yaml
View File

@ -81,7 +81,7 @@ Methods:
$.getSubnetName():
type: 'OS::Neutron::Subnet'
properties:
network_id: { get_resource: $.getNetworkName() }
network: { get_resource: $.getNetworkName() }
ip_version: 4
dns_nameservers: [ $.dnsNameserver ]
cidr: $.subnetCidr
@ -94,8 +94,8 @@ Methods:
$.getRouterInterfaceName():
type: 'OS::Neutron::RouterInterface'
properties:
router_id: $.externalRouterId
subnet_id: { get_resource: $.getSubnetName() }
router: $.externalRouterId
subnet: { get_resource: $.getSubnetName() }
- $.environment.stack.updateTemplate($template)
getRouterInterfaceName: