diff options
| author | Justin Pettit <jpettit@nicira.com> | 2011-03-06 16:54:58 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2011-03-09 15:22:11 -0800 |
| commit | 6cd1276311130c6b6576cff47aea1068c42b7829 (patch) | |
| tree | 98fabe7e2e53c3a121af638a49d757e175c71822 /xenserver | |
| parent | 29f53796260077440e41ce1fcac28db8cd89cc0b (diff) | |
| download | openvswitch-6cd1276311130c6b6576cff47aea1068c42b7829.tar.gz | |
xenserver: Remove other_config option for setting controller.
Since XenServer 5.6, "vswitch_controller" has been a first-class key for
setting the Open vSwitch controller. Prior to that, we stored it in
"other_config". Since we no longer support such old versions, we can
remove references to the "other_config" option.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'xenserver')
| -rwxr-xr-x | xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index e2dc939f0..e1c854610 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -55,15 +55,7 @@ def update(session, args): if len(pools) > 1: raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", []) pool = session.xenapi.pool.get_record(pools[0]) - try: - try: - controller = pool["vswitch_controller"] - except KeyError: - # On systems older than XenServer 5.6.0, we needed to store - # the key in "other_config". - controller = pool["other_config"]["vSwitchController"] - except KeyError, e: - controller = "" + controller = pool.get("vswitch_controller", "") ret_str = "" currentController = vswitchCurrentController() if controller == "" and currentController != "": |