Merge "XenAPI: Remove ovs_integration_bridge default value"

nova/conf/xenserver.py

@@ -22,8 +22,8 @@
 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 = [
@@ -596,7 +596,6 @@
 
 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.
@@ -607,7 +606,7 @@
 
 Possible values:
 
-* Any string that represents a bridge name(default is xapi1).
+* Any string that represents a bridge name.
 """),
 ]
 

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<n> 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.