From c4a88d597e9dae2e9fa77d30ea91349a955b0839 Mon Sep 17 00:00:00 2001 From: John Hua Date: Wed, 30 Mar 2016 10:23:58 +0800 Subject: [PATCH] XenAPI: Remove ovs_integration_bridge default value xapi1 as the default ovs_integration_bridge can be incorrect as it is dependent on the environment. xapi are internal bridges that are incrementally defined from zero. Operators should set this config value to the integration bridge used between all guests and the compute host in their environment. UpgradeImpact Change-Id: If463936553cc663fd0bd018ccc9b8395bbdff6d9 --- nova/conf/xenserver.py | 7 +++---- ...-ovs-integration-bridge-default-0b838f0816829b68.yaml | 9 +++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/remove-ovs-integration-bridge-default-0b838f0816829b68.yaml diff --git a/nova/conf/xenserver.py b/nova/conf/xenserver.py index c702f9c86e18..e5726efad08d 100644 --- a/nova/conf/xenserver.py +++ b/nova/conf/xenserver.py @@ -22,8 +22,8 @@ xenserver_group = cfg.OptGroup('xenserver', XenServer options are used when the compute_driver is set to use XenServer (compute_driver=xenapi.XenAPIDriver). -Must specify connection_url, and connection_password to use -compute_driver=xenapi.XenAPIDriver. +Must specify connection_url, connection_password and ovs_integration_bridge to +use compute_driver=xenapi.XenAPIDriver. """) xenapi_agent_opts = [ @@ -552,7 +552,6 @@ before raising VDI not found exception. xenapi_ovs_integration_bridge_opts = [ cfg.StrOpt('ovs_integration_bridge', - default='xapi1', help=""" The name of the integration Bridge that is used with xenapi when connecting with Open vSwitch. @@ -563,7 +562,7 @@ accordingly if you are using XenAPI. Possible values: -* Any string that represents a bridge name(default is xapi1). +* Any string that represents a bridge name. """), ] diff --git a/releasenotes/notes/remove-ovs-integration-bridge-default-0b838f0816829b68.yaml b/releasenotes/notes/remove-ovs-integration-bridge-default-0b838f0816829b68.yaml new file mode 100644 index 000000000000..75bcda98ca02 --- /dev/null +++ b/releasenotes/notes/remove-ovs-integration-bridge-default-0b838f0816829b68.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - > + XenServer users must now set the value of xenserver.ovs_integration_bridge before they + can use the system. Previously this had a default of "xapi1", which has now been + removed, because it is dependent on the environment. The xapi are internal bridges + that are incrementally defined from zero and "xapi1" may not be the correct bridge. + Operators should set this config value to the integration bridge used between all + guests and the compute host in their environment.