Merge "Fixes dynamic networks falling back to ctlplane" into stable/pike

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index cbbc521..8918266 100644 (file)
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -120,7 +120,7 @@ parameter_defaults:
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
   CephPoolDefaultSize: 1
-  DockerCephDaemonImage: ceph/daemon:tag-build-ceph-dfg-jewel-centos-7
+  DockerCephDaemonImage: ceph/daemon:tag-stable-3.0-jewel-centos-7
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph

diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index 1a17004..48c509d 100644 (file)
--- 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 90293ab..bce82cb 100644 (file)
--- 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 (file)
index 2e7e79f..0000000
--- 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.