Merge "Enable the correct instance managers for instance/floating ips."
diff --git a/lib/cinder b/lib/cinder
index 039c5cb..9b9d50d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -152,14 +152,13 @@
if [ "$CINDER_DRIVER" == "XenAPINFS" ]; then
(
set -u
- iniset $CINDER_CONF DEFAULT volume_driver "cinder.volume.xenapi_sm.XenAPINFSDriver"
+ iniset $CINDER_CONF DEFAULT volume_driver "cinder.volume.drivers.xenapi.sm.XenAPINFSDriver"
iniset $CINDER_CONF DEFAULT xenapi_connection_url "$CINDER_XENAPI_CONNECTION_URL"
iniset $CINDER_CONF DEFAULT xenapi_connection_username "$CINDER_XENAPI_CONNECTION_USERNAME"
iniset $CINDER_CONF DEFAULT xenapi_connection_password "$CINDER_XENAPI_CONNECTION_PASSWORD"
iniset $CINDER_CONF DEFAULT xenapi_nfs_server "$CINDER_XENAPI_NFS_SERVER"
iniset $CINDER_CONF DEFAULT xenapi_nfs_serverpath "$CINDER_XENAPI_NFS_SERVERPATH"
)
- [ $? -ne 0 ] && exit 1
fi
}
diff --git a/tools/xen/build_xva.sh b/tools/xen/build_xva.sh
index 9eae190..c359c55 100755
--- a/tools/xen/build_xva.sh
+++ b/tools/xen/build_xva.sh
@@ -66,7 +66,7 @@
# network restart required for getting the right gateway
/etc/init.d/networking restart
chown -R stack /opt/stack
-su -c "/opt/stack/run.sh > /opt/stack/run.sh.log 2>&1" stack
+su -c "/opt/stack/run.sh > /opt/stack/run.sh.log" stack
exit 0
EOF