diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-10-07 03:37:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-07 03:37:35 +0000 |
| commit | d3d0fb6a86375debe233f654b0ea901cf0beb6eb (patch) | |
| tree | 74a09d2a6a5a16f6c567ec234dcc5775341232a4 | |
| parent | 02dffd2da7a0d9e4a8c00686747f157583291c3f (diff) | |
| parent | 520be6bb4056ead8e6fad08ad96e99f7da5b341e (diff) | |
Merge "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, 8 insertions, 5 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index 48c509df..1a170045 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -4,8 +4,7 @@ description: Create networks to split out Overcloud traffic resources: {%- for network in networks %} - {%- set network_name = network.compat_name|default(network.name) %} - {{network_name}}Network: + {{network.name}}Network: type: OS::TripleO::Network::{{network.name}} {%- endfor %} @@ -19,9 +18,8 @@ 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 bce82cb2..90293ab3 100644 --- a/network_data.yaml +++ b/network_data.yaml @@ -58,7 +58,6 @@ 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 new file mode 100644 index 00000000..2e7e79f1 --- /dev/null +++ b/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes heat resource OS::TripleO::Network::Internal to be renamed back to + OS::TripleO::Network::InternalApi for backwards compatibility with + previous versions. |