diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-14 23:11:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-14 23:11:34 +0000 |
commit | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (patch) | |
tree | 1baecf44304a0c4a6459a1011312abfe65e6e5fd /network/networks.j2.yaml | |
parent | 66e1d882505a3335e290d1943a2d2b15909fd73f (diff) | |
parent | baf6eee5016fac7004a7b8be6f78d4505f347aeb (diff) |
Merge "Adds network/cidr mapping into a new service property"
Diffstat (limited to 'network/networks.j2.yaml')
-rw-r--r-- | network/networks.j2.yaml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index f19e2c09..5aec597a 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -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 %} |