rpms/fence-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fence_azure_arm: add Stack Hub support

Browse Source 
Resolves: rhbz#2211460
This commit is contained in:
Oyvind Albrigtsen 2023-07-03 12:32:35 +02:00
parent a3675e4fcd
commit acc7086b1d
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bz2211460-fence_azure-arm-2-metadata-endpoint-error-message.patch
View File

@ -1,10 +1,10 @@
--- a/lib/azure_fence.py.py 2023-06-20 16:16:38.525301510 +0200
+++ b/lib/azure_fence.py.py 2023-06-20 16:15:52.336508620 +0200
--- a/lib/azure_fence.py.py 2023-07-03 11:40:44.083882319 +0200
+++ b/lib/azure_fence.py.py 2023-07-03 11:40:38.178784811 +0200
@@ -317,12 +317,11 @@
from azure.mgmt.compute import ComputeManagementClient
cloud_environment = get_azure_cloud_environment(config)
+ if (config.Cloud.lower() == "stack") and not config.MetadataEndpoint:
+ if cloud_environment and config.Cloud.lower() == "stack" and not config.MetadataEndpoint:
+ fail_usage("metadata-endpoint not specified")
credentials = get_azure_credentials(config)
@ -15,3 +15,18 @@
compute_client = ComputeManagementClient(
credentials,
config.SubscriptionId,
@@ -339,12 +338,11 @@
from azure.mgmt.network import NetworkManagementClient
cloud_environment = get_azure_cloud_environment(config)
+ if cloud_environment and config.Cloud.lower() == "stack" and not config.MetadataEndpoint:
+ fail_usage("metadata-endpoint not specified")
credentials = get_azure_credentials(config)
if cloud_environment:
- if (config.Cloud.lower() == "stack") and not config.MetadataEndpoint:
- fail_usage("metadata-endpoint not specified")
-
network_client = NetworkManagementClient(
credentials,
config.SubscriptionId,

4
fence-agents.spec
View File

@ -87,7 +87,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.2.1
Release: 117%{?alphatag:.%{alphatag}}%{?dist}
Release: 118%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
URL: https://github.com/ClusterLabs/fence-agents
@ -1481,7 +1481,7 @@ Fence agent for IBM z/VM over IP.
%endif
%changelog
* Tue Jun 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-117
* Mon Jul 3 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-118
- fence_azure_arm: add Stack Hub support
Resolves: rhbz#2211460