- fence_azure_arm: add Stack Hub support
Resolves: rhbz#2211460
This commit is contained in:
Oyvind Albrigtsen
parent
8175c20d4c
commit
370371f084
113
bz2211460-fence_azure-arm-stack-hub-support.patch
Normal file
113
bz2211460-fence_azure-arm-stack-hub-support.patch
Normal file
@ -0,0 +1,113 @@
|
||||
From 6e0228536d30ca1bd95bfd1628c0247f094ecaa8 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Wed, 2 Mar 2022 13:49:16 +0100
|
||||
Subject: [PATCH 1/2] fence_azure_arm: add stack cloud support
|
||||
|
||||
---
|
||||
agents/azure_arm/fence_azure_arm.py | 18 ++++++++++++++----
|
||||
lib/azure_fence.py.py | 10 ++++++++++
|
||||
tests/data/metadata/fence_azure_arm.xml | 10 ++++++++++
|
||||
3 files changed, 34 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py
|
||||
index 6908169c8..e3b7c85c7 100755
|
||||
--- a/agents/azure_arm/fence_azure_arm.py
|
||||
+++ b/agents/azure_arm/fence_azure_arm.py
|
||||
@@ -183,20 +183,30 @@ def define_new_opts():
|
||||
"getopt" : ":",
|
||||
"longopt" : "cloud",
|
||||
"help" : "--cloud=[name] Name of the cloud you want to use. Supported\n\
|
||||
- values are china, germany or usgov. Do not use\n\
|
||||
- this parameter if you want to use public\n\
|
||||
- Azure.",
|
||||
+ values are china, germany, usgov, or stack. Do\n\
|
||||
+ not use this parameter if you want to use\n\
|
||||
+ public Azure.",
|
||||
"shortdesc" : "Name of the cloud you want to use.",
|
||||
"required" : "0",
|
||||
"order" : 7
|
||||
}
|
||||
+ all_opt["metadata-endpoint"] = {
|
||||
+ "getopt" : ":",
|
||||
+ "longopt" : "metadata-endpoint",
|
||||
+ "help" : "--metadata-endpoint=[URL] URL to metadata endpoint (used when cloud=stack).",
|
||||
+ "shortdesc" : "URL to metadata endpoint (used when cloud=stack).",
|
||||
+ "required" : "0",
|
||||
+ "order" : 8
|
||||
+ }
|
||||
|
||||
# Main agent method
|
||||
def main():
|
||||
compute_client = None
|
||||
network_client = None
|
||||
|
||||
- device_opt = ["login", "no_login", "no_password", "passwd", "port", "resourceGroup", "tenantId", "subscriptionId", "network-fencing", "msi", "cloud"]
|
||||
+ device_opt = ["login", "no_login", "no_password", "passwd", "port",
|
||||
+ "resourceGroup", "tenantId", "subscriptionId",
|
||||
+ "network-fencing", "msi", "cloud", "metadata-endpoint"]
|
||||
|
||||
atexit.register(atexit_handler)
|
||||
|
||||
diff --git a/lib/azure_fence.py.py b/lib/azure_fence.py.py
|
||||
index 5ca71eb42..6f1eee5b9 100644
|
||||
--- a/lib/azure_fence.py.py
|
||||
+++ b/lib/azure_fence.py.py
|
||||
@@ -251,6 +251,7 @@ def get_azure_config(options):
|
||||
config.VMName = options.get("--plug")
|
||||
config.SubscriptionId = options.get("--subscriptionId")
|
||||
config.Cloud = options.get("--cloud")
|
||||
+ config.MetadataEndpoint = options.get("--metadata-endpoint")
|
||||
config.UseMSI = "--msi" in options
|
||||
config.Tenantid = options.get("--tenantId")
|
||||
config.ApplicationId = options.get("--username")
|
||||
@@ -279,6 +280,9 @@ def get_azure_cloud_environment(config):
|
||||
elif (config.Cloud.lower() == "usgov"):
|
||||
from msrestazure.azure_cloud import AZURE_US_GOV_CLOUD
|
||||
cloud_environment = AZURE_US_GOV_CLOUD
|
||||
+ elif (config.Cloud.lower() == "stack"):
|
||||
+ from msrestazure.azure_cloud import get_cloud_from_metadata_endpoint
|
||||
+ cloud_environment = get_cloud_from_metadata_endpoint(config.MetadataEndpoint)
|
||||
|
||||
return cloud_environment
|
||||
|
||||
@@ -345,6 +349,9 @@ def get_azure_compute_client(config):
|
||||
credentials = get_azure_credentials(config)
|
||||
|
||||
if cloud_environment:
|
||||
+ if (config.Cloud.lower() == "stack") and not config.MetadataEndpoint:
|
||||
+ fail_usage("metadata-endpoint not specified")
|
||||
+
|
||||
compute_client = ComputeManagementClient(
|
||||
credentials,
|
||||
config.SubscriptionId,
|
||||
@@ -372,6 +379,9 @@ def get_azure_network_client(config):
|
||||
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,
|
||||
diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml
|
||||
index c6e1f203b..8b7450762 100644
|
||||
--- a/tests/data/metadata/fence_azure_arm.xml
|
||||
+++ b/tests/data/metadata/fence_azure_arm.xml
|
||||
@@ -98,6 +98,16 @@ When using network fencing the reboot-action will cause a quick-return once the
|
||||
<content type="string" />
|
||||
<shortdesc lang="en">Name of the cloud you want to use.</shortdesc>
|
||||
</parameter>
|
||||
+ <parameter name="metadata-endpoint" unique="0" required="0" deprecated="1">
|
||||
+ <getopt mixed="--metadata-endpoint=[URL]" />
|
||||
+ <content type="string" />
|
||||
+ <shortdesc lang="en">URL to metadata endpoint (used when cloud=stack).</shortdesc>
|
||||
+ </parameter>
|
||||
+ <parameter name="metadata_endpoint" unique="0" required="0" obsoletes="metadata-endpoint">
|
||||
+ <getopt mixed="--metadata-endpoint=[URL]" />
|
||||
+ <content type="string" />
|
||||
+ <shortdesc lang="en">URL to metadata endpoint (used when cloud=stack).</shortdesc>
|
||||
+ </parameter>
|
||||
<parameter name="quiet" unique="0" required="0">
|
||||
<getopt mixed="-q, --quiet" />
|
||||
<content type="boolean" />
|
||||
@ -87,7 +87,7 @@
|
||||
Name: fence-agents
|
||||
Summary: Set of unified programs capable of host isolation ("fencing")
|
||||
Version: 4.2.1
|
||||
Release: 115%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Release: 116%{?alphatag:.%{alphatag}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Base
|
||||
URL: https://github.com/ClusterLabs/fence-agents
|
||||
@ -271,6 +271,7 @@ Patch128: bz2183158-fence_aws-1-add-skip-race-check-parameter.patch
|
||||
Patch129: bz2183158-fence_aws-2-fail-when-power-action-request-fails.patch
|
||||
Patch130: bz2187329-fence_scsi-1-detect-devices-in-shared-vgs.patch
|
||||
Patch131: bz2187329-fence_scsi-2-support-space-separated-devices.patch
|
||||
Patch132: bz2211460-fence_azure-arm-stack-hub-support.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 hds_cb hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
|
||||
@ -480,6 +481,7 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja
|
||||
%patch129 -p1
|
||||
%patch130 -p1
|
||||
%patch131 -p1
|
||||
%patch132 -p1
|
||||
|
||||
# prevent compilation of something that won't get used anyway
|
||||
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
|
||||
@ -1477,6 +1479,10 @@ Fence agent for IBM z/VM over IP.
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-116
|
||||
- fence_azure_arm: add Stack Hub support
|
||||
Resolves: rhbz#2211460
|
||||
|
||||
* Thu May 4 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-115
|
||||
- fence_scsi: detect devices in shared VGs
|
||||
Resolves: rhbz#2187329
|
||||
|
||||
Loading…
Reference in New Issue
Block a user