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
This commit is contained in:
parent
f4fa117cc7
commit
8e20095f44
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue