diff options
author | Justin Pettit <jpettit@nicira.com> | 2010-08-09 15:07:32 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2010-08-25 16:48:21 -0700 |
commit | c76fde78c528027fe95d714aba5ccf0f01407d75 (patch) | |
tree | 66cd84edeb65d902923d460d3b12dc8b2664f354 /xenserver | |
parent | bfe62d7a6099a43976aeb591b690964ef35e5cef (diff) |
xenserver: Prepend XenServer external ids with "xs-"
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'xenserver')
-rw-r--r-- | xenserver/README | 4 | ||||
-rw-r--r-- | xenserver/automake.mk | 2 | ||||
-rwxr-xr-x | xenserver/etc_xensource_scripts_vif | 12 | ||||
-rw-r--r-- | xenserver/openvswitch-xen.spec | 10 | ||||
-rw-r--r-- | xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py | 4 | ||||
-rwxr-xr-x | xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids (renamed from xenserver/usr_share_openvswitch_scripts_refresh-network-uuids) | 0 |
6 files changed, 16 insertions, 16 deletions
diff --git a/xenserver/README b/xenserver/README index 3b7809fc..db2bd297 100644 --- a/xenserver/README +++ b/xenserver/README @@ -49,9 +49,9 @@ files are: Open vSwitch-aware replacement for Citrix script of the same name. - usr_share_openvswitch_scripts_refresh-network-uuids + usr_share_openvswitch_scripts_refresh-xs-network-uuids - Script to refresh Bridge table external-ids:network-uuids + Script to refresh Bridge table external-ids:xs-network-uuids values, which can get out-of-sync following a pool join. usr_share_openvswitch_scripts_sysconfig.template diff --git a/xenserver/automake.mk b/xenserver/automake.mk index b16fef9b..fa5b466c 100644 --- a/xenserver/automake.mk +++ b/xenserver/automake.mk @@ -23,6 +23,6 @@ EXTRA_DIST += \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ xenserver/usr_sbin_brctl \ xenserver/usr_sbin_xen-bugtool \ - xenserver/usr_share_openvswitch_scripts_refresh-network-uuids \ + xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids \ xenserver/usr_share_openvswitch_scripts_sysconfig.template \ xenserver/uuid.py diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index fe852052..91b75c12 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -92,7 +92,7 @@ handle_vswitch_vif_details() local vm_uuid=$(xenstore-read "$vm/uuid" 2>/dev/null) fi if [ -n "${vm_uuid}" ] ; then - set_vif_external_id "vm-uuid" "${vm_uuid}" + set_vif_external_id "xs-vm-uuid" "${vm_uuid}" fi local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null) @@ -100,7 +100,7 @@ handle_vswitch_vif_details() vif_uuid=$(xe vif-list --minimal vm-uuid="${vm_uuid}" device=$DEVID) fi if [ -n "${vif_uuid}" ] ; then - set_vif_external_id "vif-uuid" "${vif_uuid}" + set_vif_external_id "xs-vif-uuid" "${vif_uuid}" fi local vif_details= @@ -109,12 +109,12 @@ handle_vswitch_vif_details() net_uuid=$(xe vif-param-get uuid="${vif_uuid}" param-name=network-uuid) fi if [ -n "${net_uuid}" ] ; then - set_vif_external_id "network-uuid" "${net_uuid}" + set_vif_external_id "xs-network-uuid" "${net_uuid}" fi local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null) if [ -n "${address}" ] ; then - set_vif_external_id "vif-mac" "${address}" + set_vif_external_id "xs-vif-mac" "${address}" fi if $xs550; then @@ -129,8 +129,8 @@ handle_vswitch_vif_details() # configuration variable, but vNetManager can tolerate that. local bridge=$1 if [ -n "${net_uuid}" ] ; then - logger -t scripts-vif "${bridge} network-uuids ${net_uuid}" - echo "-- br-set-external-id $bridge network-uuids ${net_uuid}" + logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}" + echo "-- br-set-external-id $bridge xs-network-uuids ${net_uuid}" fi fi } diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index f693ea0d..80dbec70 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -73,8 +73,8 @@ install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py install -m 755 xenserver/etc_xensource_scripts_vif \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/vif -install -m 755 xenserver/usr_share_openvswitch_scripts_refresh-network-uuids \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-network-uuids +install -m 755 xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-xs-network-uuids install -m 755 xenserver/usr_sbin_xen-bugtool \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool install -m 755 xenserver/usr_sbin_brctl \ @@ -158,12 +158,12 @@ EOF fi fi -# On XenServer 5.5.0, we need refresh-network-uuids to run whenever +# On XenServer 5.5.0, we need refresh-xs-network-uuids to run whenever # XAPI starts or restarts. (On XenServer 5.6.0, XAPI calls the # "update" method of the vswitch-cfg-update plugin whenever it starts # or restarts, so this is no longer necessary.) if test "$PRODUCT_VERSION" = "5.5.0"; then - RNU=/usr/share/openvswitch/scripts/refresh-network-uuids + RNU=/usr/share/openvswitch/scripts/refresh-xs-network-uuids XSS=/opt/xensource/libexec/xapi-startup-script if test -e $XSS && (test ! -L $XSS || test "`readlink $XSS`" != $RNU); then echo "$XSS is already in use, refusing to overwrite" @@ -390,7 +390,7 @@ fi /usr/share/openvswitch/python/ovs/timeval.py /usr/share/openvswitch/python/ovs/util.py /usr/share/openvswitch/python/uuid.py -/usr/share/openvswitch/scripts/refresh-network-uuids +/usr/share/openvswitch/scripts/refresh-xs-network-uuids /usr/share/openvswitch/scripts/interface-reconfigure /usr/share/openvswitch/scripts/InterfaceReconfigure.py /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index ef2f1fe6..bc311f80 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -345,9 +345,9 @@ def set_br_external_ids(pif): xs_network_uuids += [nwrec['uuid']] vsctl_argv = [] - vsctl_argv += ['# configure network-uuids'] + vsctl_argv += ['# configure xs-network-uuids'] vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif), - 'network-uuids', ';'.join(xs_network_uuids)] + 'xs-network-uuids', ';'.join(xs_network_uuids)] return vsctl_argv diff --git a/xenserver/usr_share_openvswitch_scripts_refresh-network-uuids b/xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids index 42ebe06e..42ebe06e 100755 --- a/xenserver/usr_share_openvswitch_scripts_refresh-network-uuids +++ b/xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids |