From 8e20095f4424000d829b6d4b3404ef23ed6814f9 Mon Sep 17 00:00:00 2001
From: Dan Sneddon <dsneddon@redhat.com>
Date: Fri, 27 Apr 2018 15:58:54 -0700
Subject: [PATCH] Revert Ceph bridge names to previous values

When the NIC configs were unified under a single role.role.j2.yaml,
the bridge name for Ceph roles was changed from "br-storage" or
"br-bond" to "br-ex". This breaks upgrades which used the original
NIC config templates. This change reverts those valuse when
rendering the NIC config templates for CephStorage roles.

Closes-Bug: #1766748
Change-Id: I68b6e674d6aa86aa7d60efa3eb7b3cb874171e63
---
 network/config/bond-with-vlans/role.role.j2.yaml          | 6 +++++-
 .../single-nic-linux-bridge-vlans/role.role.j2.yaml       | 8 ++++++++
 network/config/single-nic-vlans/role.role.j2.yaml         | 4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/network/config/bond-with-vlans/role.role.j2.yaml b/network/config/bond-with-vlans/role.role.j2.yaml
index c6d486f86a..8e7e65a797 100644
--- a/network/config/bond-with-vlans/role.role.j2.yaml
+++ b/network/config/bond-with-vlans/role.role.j2.yaml
@@ -87,9 +87,13 @@ resources:
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
 {%- endif %}
-{%- if role.name != 'ComputeOvsDpdk' %}
+{%- if not role.name.startswith('ComputeOvsDpdk') %}
               - type: ovs_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-bond
+{%- else %}
                 name: bridge_name
+{% endif %}
                 dns_servers:
                   get_param: DnsServers
                 members:
diff --git a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
index 87d82c789f..c9d8e79448 100644
--- a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
+++ b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
@@ -58,7 +58,11 @@ resources:
             $network_config:
               network_config:
               - type: linux_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-storage
+{%- else %}
                 name: bridge_name
+{%- endif %}
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
@@ -86,7 +90,11 @@ resources:
               - type: vlan
                 vlan_id:
                   get_param: {{network.name}}NetworkVlanID
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                device: br-storage
+{%- else %}
                 device: bridge_name
+{%- endif %}
                 addresses:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
diff --git a/network/config/single-nic-vlans/role.role.j2.yaml b/network/config/single-nic-vlans/role.role.j2.yaml
index 03e281f4fc..0abc7ba5a7 100644
--- a/network/config/single-nic-vlans/role.role.j2.yaml
+++ b/network/config/single-nic-vlans/role.role.j2.yaml
@@ -58,7 +58,11 @@ resources:
             $network_config:
               network_config:
               - type: ovs_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-storage
+{%- else %}
                 name: bridge_name
+{%- endif %}
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers