diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-10-14 01:09:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-14 01:09:45 +0000 |
| commit | 46a0d9e8de59538bdc6ac49132abb6efecbf1ccf (patch) | |
| tree | 396f477e75ed9c89ec645aff7314887dbd6cb2bb | |
| parent | 94e8238d6b61811d705b653ffb36d1aea624d015 (diff) | |
| parent | a8e7a2087532658af9703dc69481958657b3868f (diff) | |
Merge "Revert "Fixes heat resource name for Internal API Network"" into stable/pike
| -rw-r--r-- | network/networks.j2.yaml | 6 | ||||
| -rw-r--r-- | network_data.yaml | 1 | ||||
| -rw-r--r-- | releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index 1a170045..48c509df 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -4,7 +4,8 @@ description: Create networks to split out Overcloud traffic resources: {%- for network in networks %} - {{network.name}}Network: + {%- set network_name = network.compat_name|default(network.name) %} + {{network_name}}Network: type: OS::TripleO::Network::{{network.name}} {%- endfor %} @@ -18,8 +19,9 @@ outputs: # 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 %} + {%- set network_name = network.compat_name|default(network.name) %} {{network.name_lower}}: yaql: - data: {get_attr: [{{network.name}}Network, subnet_cidr]} + data: {get_attr: [{{network_name}}Network, subnet_cidr]} expression: str($.data).replace('null', 'disabled') {%- endfor %} diff --git a/network_data.yaml b/network_data.yaml index 90293ab3..bce82cb2 100644 --- a/network_data.yaml +++ b/network_data.yaml @@ -58,6 +58,7 @@ allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}] ipv6_subnet: 'fd00:fd00:fd00:2000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] + compat_name: Internal - name: Storage vip: true name_lower: storage diff --git a/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml b/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml deleted file mode 100644 index 2e7e79f1..00000000 --- a/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Fixes heat resource OS::TripleO::Network::Internal to be renamed back to - OS::TripleO::Network::InternalApi for backwards compatibility with - previous versions. |