diff options
| author | Sten Spans <sten@blinkenlights.nl> | 2015-10-22 08:53:18 +0200 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2015-11-23 10:11:19 -0800 |
| commit | cbe0336312038f5862a69abf294a49082203cdb0 (patch) | |
| tree | 776378517b155c28fe9f1b4fd4920e37e5f9849b /xenserver | |
| parent | 932104f483ef4384d15dec1d26661da8da58de8d (diff) | |
| download | openvswitch-cbe0336312038f5862a69abf294a49082203cdb0.tar.gz | |
xenserver: Add ovsdb_port variable to xapi configuration update plugin.
The hardcoded ovsdb port causes problems when hooking up xenserver to
different SDN stacks. Changing this to a variable at the start of the
script makes it easier to update this when needed (using chef/puppet/etc)
Signed-off-by: Sten Spans <sten@blinkenlights.nl>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'xenserver')
| -rwxr-xr-x | xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index 5375f22f5..e7404e3b0 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -30,6 +30,7 @@ import re vsctl = '/usr/bin/ovs-vsctl' ofctl = '/usr/bin/ovs-ofctl' cacert_filename = '/etc/openvswitch/vswitchd.cacert' +ovsdb_port = '6640' # Delete the CA certificate, so that we go back to boot-strapping mode @@ -224,7 +225,7 @@ def setControllerCfg(controller): '/etc/xensource/xapi-ssl.pem', '/etc/xensource/xapi-ssl.pem', cacert_filename, - '--', 'set-manager', 'ssl:' + controller + ':6640']) + '--', 'set-manager', 'ssl:' + controller + ':' + ovsdb_port]) def vswitchCfgQuery(action_args): |