From 91c3360e8aa4d35e60e4c56900ff7446c482faf7 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Wed, 29 Apr 2020 10:11:14 +0200 Subject: [PATCH] Changes in env files due to new SRIOV roles This change is needed due to the new SRIOV roles added at this patch: https://review.opendev.org/#/c/710437/ Change-Id: If9724c1c9c18676529d2d95307091ce99ace254f Closes-bug: #1875898 (cherry picked from commit d3a5decd506c30a8731033b325cd004ab9c3dc6c) --- environments/services-baremetal/neutron-ovn-dvr-ha.yaml | 2 ++ environments/services-baremetal/neutron-ovn-ha.yaml | 4 ++++ environments/services/neutron-ovn-dvr-ha.yaml | 2 ++ environments/services/neutron-ovn-ha.yaml | 4 ++++ environments/services/neutron-ovn-standalone.yaml | 2 ++ 5 files changed, 14 insertions(+) diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml index 452a005baf..51045c812a 100644 --- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml +++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml @@ -27,3 +27,5 @@ parameter_defaults: NeutronPluginExtensions: "qos,port_security,dns" ControllerParameters: OVNCMSOptions: "enable-chassis-as-gw" + ControllerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" diff --git a/environments/services-baremetal/neutron-ovn-ha.yaml b/environments/services-baremetal/neutron-ovn-ha.yaml index e7085a1789..a335b9de65 100644 --- a/environments/services-baremetal/neutron-ovn-ha.yaml +++ b/environments/services-baremetal/neutron-ovn-ha.yaml @@ -27,5 +27,9 @@ parameter_defaults: NeutronBridgeMappings: "" ControllerParameters: OVNCMSOptions: "enable-chassis-as-gw" + ControllerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" NetworkerParameters: OVNCMSOptions: "enable-chassis-as-gw" + NetworkerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml index de2b23e52c..e1f0d70b28 100644 --- a/environments/services/neutron-ovn-dvr-ha.yaml +++ b/environments/services/neutron-ovn-dvr-ha.yaml @@ -29,5 +29,7 @@ parameter_defaults: NeutronPluginExtensions: "qos,port_security,dns" ControllerParameters: OVNCMSOptions: "enable-chassis-as-gw" + ControllerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" OVNDnsServers: [] KernelIpNonLocalBind: 1 diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml index 5cae15b491..619247f29d 100644 --- a/environments/services/neutron-ovn-ha.yaml +++ b/environments/services/neutron-ovn-ha.yaml @@ -28,7 +28,11 @@ parameter_defaults: NeutronBridgeMappings: "" ControllerParameters: OVNCMSOptions: "enable-chassis-as-gw" + ControllerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" NetworkerParameters: OVNCMSOptions: "enable-chassis-as-gw" + NetworkerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" OVNDnsServers: [] KernelIpNonLocalBind: 1 diff --git a/environments/services/neutron-ovn-standalone.yaml b/environments/services/neutron-ovn-standalone.yaml index 14ced315b0..8bf2dc6ee5 100644 --- a/environments/services/neutron-ovn-standalone.yaml +++ b/environments/services/neutron-ovn-standalone.yaml @@ -29,5 +29,7 @@ parameter_defaults: NeutronPluginExtensions: "qos,port_security,dns" ControllerParameters: OVNCMSOptions: "enable-chassis-as-gw" + ControllerSriovParameters: + OVNCMSOptions: "enable-chassis-as-gw" OVNDnsServers: [] KernelIpNonLocalBind: 1