Skip to content

Commit

Permalink
xenserver: Update to use upstream XenServer location for dbcache.
Browse files Browse the repository at this point in the history
I thought that this was going to be more difficult (see this email thread:
http://openvswitch.org/pipermail/dev_openvswitch.org/2010-January/001023.html
) but it turned out to be trivial.
  • Loading branch information
blp committed Jan 26, 2010
1 parent b84a058 commit 1fa5a10
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion xenserver/opt_xensource_libexec_interface-reconfigure
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import random

management_pif = None

dbcache_file = "/var/lib/openvswitch/dbcache"
dbcache_file = "/var/xapi/network.dbcache"

#
# Logging.
Expand Down
2 changes: 1 addition & 1 deletion xenserver/usr_sbin_xen-bugtool
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ VAR_LOG_DIR = '/var/log/'
VNCTERM_CORE_DIR = '/var/xen/vncterm'
VSWITCH_CORE_DIR = '/var/xen/vswitch'
OVS_VSWITCH_CONF = '/etc/ovs-vswitchd.conf'
OVS_VSWITCH_DBCACHE = '/var/lib/openvswitch/dbcache'
OVS_VSWITCH_DBCACHE = '/var/xapi/network.dbcache'
XENSOURCE_INVENTORY = '/etc/xensource-inventory'
OEM_CONFIG_DIR = '/var/xsconfig'
OEM_CONFIG_FILES_RE = re.compile(r'^.*xensource-inventory$')
Expand Down
4 changes: 2 additions & 2 deletions xenserver/vswitch-xen.spec
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ EOF
fi
fi

if test ! -e /var/lib/openvswitch/dbcache; then
if test ! -e /var/xapi/network.dbcache; then
if test "$1" = 1; then
printf "Creating xapi database cache... "
else
Expand Down Expand Up @@ -299,7 +299,7 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade
rm -f /etc/ovs-vswitchd.conf
rm -f /etc/sysconfig/vswitch
rm -f /etc/ovs-vswitchd.cacert
rm -f /var/lib/openvswitch/dbcache
rm -f /var/xapi/network.dbcache

# Configure system to use bridge
echo bridge > /etc/xensource/network.conf
Expand Down

0 comments on commit 1fa5a10

Please sign in to comment.