openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Revert "Static OVN bridge mac mappings for standalone""

This commit is contained in:
Zuul 2021-05-17 16:07:32 +00:00 committed by Gerrit Code Review
parent a1ba3e261d 903f1927dc
commit 0cac5254c2
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/standalone-upgrade/templates/standalone_config.yaml.j2
View File

@ -21,15 +21,6 @@ parameter_defaults:
NeutronPublicInterface: {{ standalone_interface }}
{% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}
OVNStaticBridgeMacMappings:
{% set physnets = [] %}
{% for sub in standalone_neutron_bridge_mappings.split(',') %}
{% set _ = physnets.append(sub.split(':')[0]) %}
{% endfor %}
{{ standalone_hostname.split('.')[0] }}:
{% for physnet in physnets %}
{{ physnet }}: {{ "fa:16:3a:00:53:" + '%02x' % loop.index }}
{% endfor %}
{% endif %}
{% if standalone_neutron_physical_bridge is defined and standalone_neutron_physical_bridge %}
NeutronPhysicalBridge: {{ standalone_neutron_physical_bridge }}

9
roles/standalone/templates/standalone_config.yaml.j2
View File

@ -29,15 +29,6 @@ parameter_defaults:
NeutronPublicInterface: {{ standalone_interface }}
{% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}
OVNStaticBridgeMacMappings:
{% set physnets = [] %}
{% for sub in standalone_neutron_bridge_mappings.split(',') %}
{% set _ = physnets.append(sub.split(':')[0]) %}
{% endfor %}
{{ standalone_hostname.split('.')[0] }}:
{% for physnet in physnets %}
{{ physnet }}: {{ "fa:16:3a:00:53:" + '%02x' % loop.index }}
{% endfor %}
{% endif %}
{% if standalone_neutron_physical_bridge is defined and standalone_neutron_physical_bridge %}
NeutronPhysicalBridge: {{ standalone_neutron_physical_bridge }}