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>

diff --git a/AUTHORS b/AUTHORS
index a7c52b0..a083dde 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -178,6 +178,7 @@ Simon Horman            horms@verge.net.au
 Simon Horman            simon.horman@netronome.com
 Sorin Vinturis          svinturis@cloudbasesolutions.com
 Steffen Gebert          steffen.gebert@informatik.uni-wuerzburg.de
+Sten Spans              sten@blinkenlights.nl
 Stephane A. Sezer       sas@cd80.net
 Stephen Finucane        stephen.finucane@intel.com
 SUGYO Kazushi           sugyo.org@gmail.com

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index 5375f22..e7404e3 100755 (executable)
--- 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):