You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.4 KiB
41 lines
1.4 KiB
7 years ago
|
diff -uNr a/heartbeat/VirtualDomain b/heartbeat/VirtualDomain
|
||
|
|
--- a/heartbeat/VirtualDomain 2015-11-20 11:52:58.314263831 +0100
|
||
|
|
+++ b/heartbeat/VirtualDomain 2015-11-20 11:53:55.247196256 +0100
|
||
|
|
@@ -340,13 +340,32 @@
|
||
|
|
return $rc
|
||
|
|
}
|
||
|
|
|
||
|
|
+# virsh undefine removes configuration files if they are in
|
||
|
|
+# directories which are managed by libvirt. such directories
|
||
|
|
+# include also subdirectories of /etc (for instance
|
||
|
|
+# /etc/libvirt/*) which may be surprising. VirtualDomain didn't
|
||
|
|
+# include the undefine call before, hence this wasn't an issue
|
||
|
|
+# before.
|
||
|
|
+#
|
||
|
|
+# There seems to be no way to find out which directories are
|
||
|
|
+# managed by libvirt.
|
||
|
|
+#
|
||
|
|
verify_undefined() {
|
||
|
|
- for dom in `virsh --connect=${OCF_RESKEY_hypervisor} list --all --name 2>/dev/null`; do
|
||
|
|
- if [ "$dom" = "$DOMAIN_NAME" ]; then
|
||
|
|
+ local tmpf
|
||
|
|
+ if virsh --connect=${OCF_RESKEY_hypervisor} list --all --name 2>/dev/null | grep -wqs "$DOMAIN_NAME"
|
||
|
|
+ then
|
||
|
|
+ tmpf=$(mktemp -t vmcfgsave.XXXXXX)
|
||
|
|
+ if [ ! -r "$tmpf" ]; then
|
||
|
|
+ ocf_log warn "unable to create temp file, disk full?"
|
||
|
|
+ # we must undefine the domain
|
||
|
|
virsh $VIRSH_OPTIONS undefine $DOMAIN_NAME > /dev/null 2>&1
|
||
|
|
- return
|
||
|
|
+ else
|
||
|
|
+ cp -p $OCF_RESKEY_config $tmpf
|
||
|
|
+ virsh $VIRSH_OPTIONS undefine $DOMAIN_NAME > /dev/null 2>&1
|
||
|
|
+ [ -f $OCF_RESKEY_config ] || cp -f $tmpf $OCF_RESKEY_config
|
||
|
|
+ rm -f $tmpf
|
||
|
|
fi
|
||
|
|
- done
|
||
|
|
+ fi
|
||
|
|
}
|
||
|
|
|
||
|
|
VirtualDomain_Start() {
|