X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fnetworks.j2.yaml;h=5aec597a8f4f2a3f37c8ed8091244ea476866092;hb=e57a7cdd733c5edd974749cd21e0563c8c6ca9fa;hp=ef977d8d74706fa5477c5a91bdf294d612ea92a6;hpb=6c43d5b4ffc33b83f7f3bc2098b8a49b4c5c2364;p=apex-tripleo-heat-templates.git diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index ef977d8d..5aec597a 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: Create networks to split out Overcloud traffic @@ -15,3 +15,23 @@ resources: NetworkExtraConfig: type: OS::TripleO::Network::ExtraConfig + + +outputs: + net_cidr_map: + value: + # NOTE(gfidente): we need to replace the null value with a + # string to work around https://bugs.launchpad.net/heat/+bug/1700025 + {%- for network in networks %} + {%- if network.name != 'InternalApi' %} + {{network.name_lower}}: + yaql: + data: {get_attr: [{{network.name}}Network, subnet_cidr]} + expression: str($.data).replace('null', 'disabled') + {%- else %} + {{network.name_lower}}: + yaql: + data: {get_attr: [InternalNetwork, subnet_cidr]} + expression: str($.data).replace('null', 'disabled') + {%- endif %} + {%- endfor %}