openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use str_split to compute netmask in _v6 port templates 

Change-Id: I282dbc025500b1628d4f08a49b54a2adefd38b5f
This commit is contained in:
Giulio Fidente 2016-04-18 18:51:11 +02:00
parent d2445af81d
commit b9bb2633c5
11 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/ports/external_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6
@ -43,12 +43,10 @@ outputs:
- {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the external network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
- '/'
- {get_param: [ExternalNetCidr, -2]}
- {get_param: [ExternalNetCidr, -1]}
- {str_split: ['/', {get_attr: [ExternalPort, subnets, 0, cidr]}, 1]}

6
network/ports/external_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port on the external network. The IP address will be chosen
@ -57,12 +57,10 @@ outputs:
- {get_attr: [ExternalPort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the external network IP
value:
list_join:
- ''
- - {get_attr: [ExternalPort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [ExternalPort, subnets, 0, cidr, -2]}
- {get_attr: [ExternalPort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [ExternalPort, subnets, 0, cidr]}, 1]}

6
network/ports/internal_api_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6
@ -43,12 +43,10 @@ outputs:
- {get_param: [IPPool, {get_param: InternalApiNetName}, {get_param: NodeIndex}]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the internal API network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: InternalApiNetName}, {get_param: NodeIndex}]}
- '/'
- {get_param: [InternalApiNetCidr, -2]}
- {get_param: [InternalApiNetCidr, -1]}
- {str_split: ['/', {get_attr: [InternalApiPort, subnets, 0, cidr]}, 1]}

6
network/ports/internal_api_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port on the internal_api network.
@ -52,12 +52,10 @@ outputs:
- {get_attr: [InternalApiPort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the internal API network IP
value:
list_join:
- ''
- - {get_attr: [InternalApiPort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [InternalApiPort, subnets, 0, cidr, -2]}
- {get_attr: [InternalApiPort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [InternalApiPort, subnets, 0, cidr]}, 1]}

6
network/ports/storage_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6
@ -43,12 +43,10 @@ outputs:
- {get_param: [IPPool, {get_param: StorageNetName}, {get_param: NodeIndex}]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the storage network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: StorageNetName}, {get_param: NodeIndex}]}
- '/'
- {get_param: [StorageNetCidr, -2]}
- {get_param: [StorageNetCidr, -1]}
- {str_split: ['/', {get_attr: [StoragePort, subnets, 0, cidr]}, 1]}

6
network/ports/storage_mgmt_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Returns an IP from a network mapped list of IPs This version is for IPv6
@ -43,12 +43,10 @@ outputs:
- {get_param: [IPPool, {get_param: StorageMgmtNetName}, {get_param: NodeIndex}]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the storage MGMT network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: StorageMgmtNetName}, {get_param: NodeIndex}]}
- '/'
- {get_param: [StorageMgmtNetCidr, -2]}
- {get_param: [StorageMgmtNetCidr, -1]}
- {str_split: ['/', {get_attr: [StorageMgmtPort, subnets, 0, cidr]}, 1]}

6
network/ports/storage_mgmt_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port on the storage_mgmt API network.
@ -52,12 +52,10 @@ outputs:
- {get_attr: [StorageMgmtPort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the storage_mgmt network IP
value:
list_join:
- ''
- - {get_attr: [StorageMgmtPort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [StorageMgmtPort, subnets, 0, cidr, -2]}
- {get_attr: [StorageMgmtPort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [StorageMgmtPort, subnets, 0, cidr]}, 1]}

6
network/ports/storage_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port on the storage network.
@ -52,12 +52,10 @@ outputs:
- {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the storage network IP
value:
list_join:
- ''
- - {get_attr: [StoragePort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [StoragePort, subnets, 0, cidr, -2]}
- {get_attr: [StoragePort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [StoragePort, subnets, 0, cidr]}, 1]}

6
network/ports/tenant_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Returns an IP from a network mapped list of IPs
@ -42,12 +42,10 @@ outputs:
- {get_param: [IPPool, {get_param: ExternalNetName}, {get_param: NodeIndex}]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the tenant network IP
value:
list_join:
- ''
- - {get_param: [IPPool, {get_param: TenantNetName}, {get_param: NodeIndex}]}
- '/'
- {get_param: [TenantNetCidr, -2]}
- {get_param: [TenantNetCidr, -1]}
- {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}

6
network/ports/tenant_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port on the tenant network.
@ -52,12 +52,10 @@ outputs:
- {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the tenant network IP
value:
list_join:
- ''
- - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [TenantPort, subnets, 0, cidr, -2]}
- {get_attr: [TenantPort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}

6
network/ports/vip_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: 2015-10-15
description: >
Creates a port for a VIP on the isolated network NetworkName.
@ -54,12 +54,10 @@ outputs:
- {get_attr: [VipPort, fixed_ips, 0, ip_address]}
- ']'
ip_subnet:
# FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
description: IP/Subnet CIDR for the network associated with this IP
value:
list_join:
- ''
- - {get_attr: [VipPort, fixed_ips, 0, ip_address]}
- '/'
- {get_attr: [VipPort, subnets, 0, cidr, -2]}
- {get_attr: [VipPort, subnets, 0, cidr, -1]}
- {str_split: ['/', {get_attr: [VipPort, subnets, 0, cidr]}, 1]}