openstack/nova
Code Issues Proposed changes

Merge "XenAPI: Remove ovs_integration_bridge default value"

Browse Source
This commit is contained in:
Jenkins 2016-12-17 05:57:46 +00:00 committed by Gerrit Code Review
commit adca1b54e0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/conf/xenserver.py
View File

@ -22,8 +22,8 @@ xenserver_group = cfg.OptGroup('xenserver',
XenServer options are used when the compute_driver is set to use XenServer options are used when the compute_driver is set to use
XenServer (compute_driver=xenapi.XenAPIDriver). XenServer (compute_driver=xenapi.XenAPIDriver).
Must specify connection_url, and connection_password to use Must specify connection_url, connection_password and ovs_integration_bridge to
compute_driver=xenapi.XenAPIDriver. use compute_driver=xenapi.XenAPIDriver.
""") """)
xenapi_agent_opts = [ xenapi_agent_opts = [
@ -596,7 +596,6 @@ before raising VDI not found exception.
xenapi_ovs_integration_bridge_opts = [ xenapi_ovs_integration_bridge_opts = [
cfg.StrOpt('ovs_integration_bridge', cfg.StrOpt('ovs_integration_bridge',
default='xapi1',
help=""" help="""
The name of the integration Bridge that is used with xenapi The name of the integration Bridge that is used with xenapi
when connecting with Open vSwitch. when connecting with Open vSwitch.
@ -607,7 +606,7 @@ accordingly if you are using XenAPI.
Possible values: Possible values:
* Any string that represents a bridge name(default is xapi1). * Any string that represents a bridge name.
"""), """),
] ]

9
releasenotes/notes/remove-ovs-integration-bridge-default-0b838f0816829b68.yaml Normal file
View File

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