0876d5cd99
* fence_azure_arm: add fencing agent for Azure Resource Manager * fence_lpar: Add support for IVM * fence_lpar: Handle exceptions when invalid output is read * fence_zvmip: Update XML metadata * fence_compute: fix ConnectionError by using full module name * fence_powerman: add fence agent for powerman * Suppress InsecureRequestWarning when ssl_insecure is given * compute: Correctly handle installations without tagged flavours * compute: Use the best available nova API version * compute: correctly implement 'on' when the force-down API call is available * compute: Correctly identify when the nodename already includes the supplied domain * compute: Ensure we can connect to nova when fixing the plug name * compute: Simpler check for nova force down compatibility - Rebase and remove merged patches: * Remove 0001-fence_compute-Create-nova-client-with-API-2.11.patch * Remove 0002-fence_compute-Keep-compatibility-with-python-novacli.patch * Remove 0003-fence_compute-Only-list-nova-compute-services-when-g.patch * Remove 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch * Remove 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch * Remove 0006-fence_compute-Fix-use-of-undefined-variable.patch * Remove 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch * Remove 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch * Add 0001-fence_compute-Only-list-nova-compute-services-when-g.patch * Add 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch * Add 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch * Add 0004-fence_compute-Fix-handling-of-domain-None.patch * Add 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch * Add 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch * Add 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=56
27 lines
903 B
Diff
27 lines
903 B
Diff
From 20aa88df8d23b88bdb8d500bec9c8a9ea4ae2232 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Untz <vuntz@suse.com>
|
|
Date: Thu, 1 Dec 2016 14:04:19 +0100
|
|
Subject: [PATCH 8/9] Fix travis
|
|
|
|
Regression introduced in 0f170a937bd0944e172004dc30df2fc240d9ca20
|
|
---
|
|
tests/data/metadata/fence_compute.xml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
|
|
index 83bdb53..58f77a6 100644
|
|
--- a/tests/data/metadata/fence_compute.xml
|
|
+++ b/tests/data/metadata/fence_compute.xml
|
|
@@ -9,7 +9,7 @@
|
|
<shortdesc lang="en">Fencing action</shortdesc>
|
|
</parameter>
|
|
<parameter name="auth-url" unique="0" required="0">
|
|
- <getopt mixed="-k, --auth-url=[tenant]" />
|
|
+ <getopt mixed="-k, --auth-url=[url]" />
|
|
<content type="string" default="" />
|
|
<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
|
|
</parameter>
|
|
--
|
|
2.10.1
|
|
|