Default all roles for deployed-server to net-config-static-bridge

Since OVN is the default in TripleO, Compute roles need to have br-ex.

However, when using deployed-server, the default nic config for the
non-Controller roles was using net-config-static.yaml, which does not
create br-ex. The generate-config step then fails for the ovn container
since br-ex does not exist.

This patch will default all roles to net-config-static-bridge.yaml.

Change-Id: I5fc243d4e7fbe84ed212bef22b6ffdd4169823aa
Closes-Bug: #1860353
This commit is contained in:
James Slagle 2020-01-20 12:18:57 -05:00
parent fe56b682c3
commit 2b3a5aa1f6
2 changed files with 8 additions and 3 deletions

View File

@ -5,10 +5,8 @@ resource_registry:
{% for role in roles %}
# Default nic config mappings
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static.yaml
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static-bridge.yaml
{% endfor %}
OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml
parameter_defaults:
EnablePackageInstall: True

View File

@ -0,0 +1,7 @@
---
fixes:
- All roles now default to using the net-config-static-bridge.yaml nic config
when using deployed-server. Since OVN is the default in TripleO, Compute
roles need to have br-ex. Previously when using deployed-server, the default
nic config for the non-Controller roles was net-config-static.yaml, which
did not create br-ex.