diff --git a/SOURCES/bz1859932-fence_evacuate-support-private-flavors.patch b/SOURCES/bz1859932-fence_evacuate-support-private-flavors.patch new file mode 100644 index 0000000..60eddd2 --- /dev/null +++ b/SOURCES/bz1859932-fence_evacuate-support-private-flavors.patch @@ -0,0 +1,26 @@ +From 18ef1622475db947aef70042523f4a176c4155bd Mon Sep 17 00:00:00 2001 +From: Luca Miccini +Date: Thu, 23 Jul 2020 14:33:38 +0200 +Subject: [PATCH] [fence_evacuate] Enable evacuation of instances using private + flavors + +This commit extends the flavor.list() api call in the fence_evacuate +agent to fetch private flavors that could be tagged with the 'evacuable' +attribute, allowing instance-ha to be enabled on a per tenant basis. +--- + agents/evacuate/fence_evacuate.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/evacuate/fence_evacuate.py b/agents/evacuate/fence_evacuate.py +index 88837dd8..53d6fd15 100644 +--- a/agents/evacuate/fence_evacuate.py ++++ b/agents/evacuate/fence_evacuate.py +@@ -87,7 +87,7 @@ def _is_server_evacuable(server, evac_flavors, evac_images): + + def _get_evacuable_flavors(connection): + result = [] +- flavors = connection.flavors.list() ++ flavors = connection.flavors.list(is_public=None) + # Since the detailed view for all flavors doesn't provide the extra specs, + # we need to call each of the flavor to get them. + for flavor in flavors: diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 2e64d02..799fb15 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -29,7 +29,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 52%{?alphatag:.%{alphatag}}%{?dist} +Release: 53%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -109,6 +109,7 @@ Patch67: bz1839776-fence_aws-catch-connectionerror.patch Patch68: bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch Patch69: bz1793739-fence_vmware_rest-3-fix-encode-issue.patch Patch70: bz1860544-fence_lpar-fix-long-user-host-issue.patch +Patch71: bz1859932-fence_evacuate-support-private-flavors.patch %if 0%{?fedora} || 0%{?rhel} > 7 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti @@ -257,6 +258,7 @@ BuildRequires: python3-google-api-client %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1048,6 +1050,11 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Fri Aug 7 2020 Oyvind Albrigtsen - 4.2.1-53 +- fence_evacuate: enable evacuation of instances using private flavors + + Resolves: rhbz#1859932 + * Tue Jul 28 2020 Oyvind Albrigtsen - 4.2.1-52 - fence_lpar: fix issue with long username, hostname, etc not working when the command run by the agent exceeds 80 characters