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 <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
lynn901 · Nov 23, 2015 · cbe0336 · cbe0336
1 parent 932104f
commit cbe0336
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -178,6 +178,7 @@ Simon Horman            [email protected]
 Simon Horman            [email protected]
 Sorin Vinturis          [email protected]
 Steffen Gebert          [email protected]
+Sten Spans              [email protected]
 Stephane A. Sezer       [email protected]
 Stephen Finucane        [email protected]
 SUGYO Kazushi           [email protected]

diff --git 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):