diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-08-04 18:52:17 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-08-25 16:48:16 -0700 |
| commit | bfe62d7a6099a43976aeb591b690964ef35e5cef (patch) | |
| tree | 85db35d69098d83f1289169329f7046d58b298c0 /xenserver/etc_init.d_openvswitch | |
| parent | d9af660c057e5f272e4ea94659554ade733b3dad (diff) | |
| download | openvswitch-bfe62d7a6099a43976aeb591b690964ef35e5cef.tar.gz | |
xenserver: Report the system type and version as external ids
The configuration schema defines the system-type and system-version
external-ids for the Open_vSwitch table. This commit adds support for
reporting them on XenServer.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'xenserver/etc_init.d_openvswitch')
| -rwxr-xr-x | xenserver/etc_init.d_openvswitch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index c52864eb2..19d825b38 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -290,12 +290,15 @@ EOF esac } -function set_system_uuid { - if test -n "$INSTALLATION_UUID"; then - action "Configuring Open vSwitch system UUID" true - $vsctl --no-wait set Open_vSwitch . external-ids:system-uuid="$INSTALLATION_UUID" +function set_system_ids { + if [ -f /etc/xensource-inventory ]; then + action "Configuring Open vSwitch system IDs" true + $vsctl --no-wait set Open_vSwitch . \ + external-ids:system-type="$PRODUCT_BRAND" \ + external-ids:system-version="$PRODUCT_VERSION-$BUILD_NUMBER" \ + external-ids:system-uuid="$INSTALLATION_UUID" else - action "Configuring Open vSwitch system UUID" false + action "Configuring Open vSwitch system IDs" false fi } @@ -333,7 +336,7 @@ function start { done fi - set_system_uuid + set_system_ids start_vswitchd if [ "${ENABLE_BRCOMPAT}" = "y" ] ; then |