From 2b3a5aa1f6d029c5d7a267d360b9419f2b9c31a4 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 20 Jan 2020 12:18:57 -0500 Subject: [PATCH] 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 --- environments/deployed-server-environment.j2.yaml | 4 +--- ...d-server-net-config-static-bridge-c15bf767d3a28759.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/deployed-server-net-config-static-bridge-c15bf767d3a28759.yaml diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml index 76d66939f1..c93c5b9a04 100644 --- a/environments/deployed-server-environment.j2.yaml +++ b/environments/deployed-server-environment.j2.yaml @@ -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 diff --git a/releasenotes/notes/deployed-server-net-config-static-bridge-c15bf767d3a28759.yaml b/releasenotes/notes/deployed-server-net-config-static-bridge-c15bf767d3a28759.yaml new file mode 100644 index 0000000000..d140ab36ec --- /dev/null +++ b/releasenotes/notes/deployed-server-net-config-static-bridge-c15bf767d3a28759.yaml @@ -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.