X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=network%2Fports%2Ftenant_v6.yaml;h=47d52d8a95f4770cf64b3a2b67394756a34d0788;hb=9436d87e7e3b2767bf8dcb69e9fc0eb62173e6fb;hp=6ca375492230accbe0c6faac1e33f488989eb956;hpb=00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7;p=apex-tripleo-heat-templates.git diff --git a/network/ports/tenant_v6.yaml b/network/ports/tenant_v6.yaml index 6ca37549..47d52d8a 100644 --- a/network/ports/tenant_v6.yaml +++ b/network/ports/tenant_v6.yaml @@ -1,11 +1,11 @@ -heat_template_version: 2015-04-30 +heat_template_version: pike description: > Creates a port on the tenant network. parameters: TenantNetName: - description: Name of the tenant neutron network + description: The name of the tenant network. default: tenant type: string PortName: @@ -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]}