From d1002b978fd2807f43ab468fcf0214ac2bf00299 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 17 Aug 2022 10:13:43 +0000 Subject: [PATCH] import fence-agents-4.2.1-103.el8 --- .fence-agents.metadata | 30 ------ .gitignore | 30 ------ .../bz1886074-3-fence_openstack-bundled.patch | 10 -- SOURCES/requirements-openstack.txt | 3 - SPECS/fence-agents.spec | 99 +++---------------- 5 files changed, 12 insertions(+), 160 deletions(-) delete mode 100644 SOURCES/bz1886074-3-fence_openstack-bundled.patch delete mode 100644 SOURCES/requirements-openstack.txt diff --git a/.fence-agents.metadata b/.fence-agents.metadata index b4c9b1e..00c9f88 100644 --- a/.fence-agents.metadata +++ b/.fence-agents.metadata @@ -1,6 +1,5 @@ 3297473a9d57e93ff378eab173990c1b64673c01 SOURCES/Jinja2-3.0.2.tar.gz e1b766b2b1601fde67b3b19ed2f13b9746bb1cca SOURCES/MarkupSafe-2.0.1.tar.gz -53fc16036940089ceadd4127381e40fd6106a7ed SOURCES/PyYAML-5.1.tar.gz a8c40a3ae9d4c159382a58db3153d83e5521c51e SOURCES/PyYAML-6.0.tar.gz 0a56f6d9ed2014a363486d33b63eca094379be06 SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz c2a98b9a1562d223a76514f05028488ca000c395 SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz @@ -10,58 +9,29 @@ f14647a4d37a9a254c4e711b95a7654fc418e41e SOURCES/aliyun-python-sdk-vpc-3.0.2.tar b13e22d55867e2ca5f92e5289cfdc21ba6e343aa SOURCES/certifi-2021.10.8.tar.gz 2384f6cfba4685d901262e073a4455d4cf76d102 SOURCES/chardet-4.0.0.tar.gz 865df92e66e5dc7b940144cbad8115c07dc8784f SOURCES/charset-normalizer-2.0.7.tar.gz -9fa96037a1a985fe7dda81c0e1e35ae015163d88 SOURCES/charset_normalizer-2.0.4-py3-none-any.whl -dfabded3494bffe6965b1bf3d37383736e642bdb SOURCES/debtcollector-2.2.0-py3-none-any.whl e2561df8e7ff9113dab118a651371dd88dab0142 SOURCES/fence-agents-4.2.1.tar.gz f4e578dc0ed68d6667d7b36cdfc2647d55e9858f SOURCES/google-auth-2.3.0.tar.gz 74ec77d2e2ef6b2ef8503e6e398faa6f3ba298ae SOURCES/httplib2-0.19.1-py3-none-any.whl -e3a19aca36f6631ba9e33e66b855835776e8e120 SOURCES/idna-3.2-py3-none-any.whl 08c0449533fc94462f78652dea209099754d9ee4 SOURCES/idna-3.3.tar.gz -31acc5e5f7b45d5cd3e0f4200fd21c5eb57da733 SOURCES/importlib_metadata-4.8.3.tar.gz -b5288072ea6292135038402dbe56ac1e676ed09d SOURCES/importlib_resources-5.4.0.tar.gz -8672ed298c51abba24fdf5298ddeef7b16027071 SOURCES/iso8601-0.1.16-py2.py3-none-any.whl 356c48dfea2214dd9e7e2b222a99dddfe9c0d05c SOURCES/jmespath-0.10.0.tar.gz -22a38dbc79cc3cbe53c2bf306ad22a472be1a6f4 SOURCES/keystoneauth1-4.3.1-py3-none-any.whl d06a9547b1a87e9c51b0a7c708189d993f2e3d89 SOURCES/kubernetes-12.0.1.tar.gz -194b341fe37fe6ce992c637a728484e3cee47394 SOURCES/msgpack-1.0.2.tar.gz -ee77c30d5350378e9ca9932b724d1a26c9cc164b SOURCES/netaddr-0.8.0-py2.py3-none-any.whl -c1dd2b481a0101eb518bf47bdf40ea53ab61ca62 SOURCES/netifaces-0.11.0.tar.gz f6efa66f6106b069b5c0e0cf8cc677e4e96c91ca SOURCES/oauthlib-3.1.1.tar.gz 570d69d8c108ebb8aee562389d13b07dfb61ce25 SOURCES/openshift-0.12.1.tar.gz -2b0aea8c7985b474f0719b916a1b6475caedf42f SOURCES/os_service_types-1.7.0-py2.py3-none-any.whl -e26e191810fd455958aa3fcf7c7447180c14de8d SOURCES/oslo.config-8.7.1-py3-none-any.whl -7375d2b1c5d3b13d5637a00b9514104069bca329 SOURCES/oslo.i18n-5.0.1-py3-none-any.whl -8a4aab8b645772fa6132df1ce23267b2fae356d3 SOURCES/oslo.serialization-4.2.0-py3-none-any.whl -b302350fda92e8b96a402fbb4cdf639f06192b62 SOURCES/oslo.utils-4.10.0-py3-none-any.whl -f712c7731d0d65cfc8fc7c61afeeeeca4b84b549 SOURCES/packaging-21.0-py3-none-any.whl bccbc1bf76a9db46998eb8e1ffa2f2a2baf9237a SOURCES/packaging-21.2-py3-none-any.whl -d3d07b885ca4d10994a30682106e37785e6e780c SOURCES/pbr-5.6.0-py2.py3-none-any.whl -5ad34ad3dbfaf6d4e72860287043120c641e4524 SOURCES/prettytable-2.2.0-py3-none-any.whl e0fa19f8fda46a1fa2253477499b116b33f67175 SOURCES/pyasn1-0.4.8.tar.gz 43b89feb6864fe359aae89120627165219de313b SOURCES/pyasn1-modules-0.2.8.tar.gz 326a73f58a62ebee00c11a12cfdd838b196e0e8e SOURCES/pycryptodome-3.6.4.tar.gz c8307f47e3b75a2d02af72982a2dfefa3f56e407 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 SOURCES/python-dateutil-2.8.2.tar.gz 1dc2fa004aa6517f1620e55d8a7b8e68a9cf2a47 SOURCES/python-string-utils-1.0.0.tar.gz -e10df4212f19d34774bb329e8b497dafa4d099d5 SOURCES/python_keystoneclient-4.2.0-py3-none-any.whl -2c61c4407646813e5e5dd6f09586704efca371f0 SOURCES/python_novaclient-17.5.0-py3-none-any.whl -f97118c1c04ef387689b52f4492a4d8739e30888 SOURCES/pytz-2022.1.tar.gz -d20e2df000dd43249c3a9eed041f08a812a93423 SOURCES/requests-2.26.0-py2.py3-none-any.whl 8c7a89d183d3e9b70bf91ba5b75eccf7111b9d8d SOURCES/requests-2.26.0.tar.gz f139aed770519b6a095b8fdc888d03955cbe9d8e SOURCES/requests-oauthlib-1.3.0.tar.gz -b8e2041ff9ad37dba2f78e4b59b57cbed5f1b8ff SOURCES/rfc3986-1.5.0-py2.py3-none-any.whl e8a53067e03fe1b6682fd99a40a7359396a06daa SOURCES/rsa-4.7.2.tar.gz d1011ff44cd5a045de0460c1b79ec65592e86860 SOURCES/ruamel.yaml-0.17.16.tar.gz 27de97227bbbde5a9f571f9fad223578d7bdf7cc SOURCES/ruamel.yaml.clib-0.2.6.tar.gz d5354718cb8c9330d3abc27445467ce8a5ed9d70 SOURCES/setuptools-58.3.0.tar.gz a4f02fddae697614e356cadfddb6241cc7737f38 SOURCES/setuptools_scm-6.3.2.tar.gz 06fa0bb50f2a4e2917fd14c21e9d2d5508ce0163 SOURCES/six-1.16.0.tar.gz -c612ea4b006feec1444ac61c233632f7e4852380 SOURCES/stevedore-3.4.0-py3-none-any.whl b42b7960047441db7dc021cc20e14279bd836f8d SOURCES/tomli-1.0.1.tar.gz -490cc095aef4ebf40921989872e1ce0d582fc481 SOURCES/typing_extensions-3.10.0.2.tar.gz eb35c3fd8b0867ae988a15917d6b80e8bdf60222 SOURCES/urllib3-1.26.7.tar.gz -6cbb5d6384f6d2c8667fb3c5710ecf90dbf9e7fc SOURCES/wcwidth-0.2.5-py2.py3-none-any.whl 540f083782c584989c1a0f69ffd69ba7aae07db6 SOURCES/websocket-client-1.2.1.tar.gz -b6c48d8714e043524be7a869d1db0adcd8441cd4 SOURCES/wheel-0.37.0-py2.py3-none-any.whl -6c18d34144c6faba208509b8091d35acc9842081 SOURCES/wrapt-1.12.1.tar.gz -b5c8b7519876285d93611216b4ecf0a7b5d59174 SOURCES/zipp-3.6.0.tar.gz diff --git a/.gitignore b/.gitignore index 9f13c42..050b1cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ SOURCES/Jinja2-3.0.2.tar.gz SOURCES/MarkupSafe-2.0.1.tar.gz -SOURCES/PyYAML-5.1.tar.gz SOURCES/PyYAML-6.0.tar.gz SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz @@ -10,58 +9,29 @@ SOURCES/cachetools-4.2.4.tar.gz SOURCES/certifi-2021.10.8.tar.gz SOURCES/chardet-4.0.0.tar.gz SOURCES/charset-normalizer-2.0.7.tar.gz -SOURCES/charset_normalizer-2.0.4-py3-none-any.whl -SOURCES/debtcollector-2.2.0-py3-none-any.whl SOURCES/fence-agents-4.2.1.tar.gz SOURCES/google-auth-2.3.0.tar.gz SOURCES/httplib2-0.19.1-py3-none-any.whl -SOURCES/idna-3.2-py3-none-any.whl SOURCES/idna-3.3.tar.gz -SOURCES/importlib_metadata-4.8.3.tar.gz -SOURCES/importlib_resources-5.4.0.tar.gz -SOURCES/iso8601-0.1.16-py2.py3-none-any.whl SOURCES/jmespath-0.10.0.tar.gz -SOURCES/keystoneauth1-4.3.1-py3-none-any.whl SOURCES/kubernetes-12.0.1.tar.gz -SOURCES/msgpack-1.0.2.tar.gz -SOURCES/netaddr-0.8.0-py2.py3-none-any.whl -SOURCES/netifaces-0.11.0.tar.gz SOURCES/oauthlib-3.1.1.tar.gz SOURCES/openshift-0.12.1.tar.gz -SOURCES/os_service_types-1.7.0-py2.py3-none-any.whl -SOURCES/oslo.config-8.7.1-py3-none-any.whl -SOURCES/oslo.i18n-5.0.1-py3-none-any.whl -SOURCES/oslo.serialization-4.2.0-py3-none-any.whl -SOURCES/oslo.utils-4.10.0-py3-none-any.whl -SOURCES/packaging-21.0-py3-none-any.whl SOURCES/packaging-21.2-py3-none-any.whl -SOURCES/pbr-5.6.0-py2.py3-none-any.whl -SOURCES/prettytable-2.2.0-py3-none-any.whl SOURCES/pyasn1-0.4.8.tar.gz SOURCES/pyasn1-modules-0.2.8.tar.gz SOURCES/pycryptodome-3.6.4.tar.gz SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl SOURCES/python-dateutil-2.8.2.tar.gz SOURCES/python-string-utils-1.0.0.tar.gz -SOURCES/python_keystoneclient-4.2.0-py3-none-any.whl -SOURCES/python_novaclient-17.5.0-py3-none-any.whl -SOURCES/pytz-2022.1.tar.gz -SOURCES/requests-2.26.0-py2.py3-none-any.whl SOURCES/requests-2.26.0.tar.gz SOURCES/requests-oauthlib-1.3.0.tar.gz -SOURCES/rfc3986-1.5.0-py2.py3-none-any.whl SOURCES/rsa-4.7.2.tar.gz SOURCES/ruamel.yaml-0.17.16.tar.gz SOURCES/ruamel.yaml.clib-0.2.6.tar.gz SOURCES/setuptools-58.3.0.tar.gz SOURCES/setuptools_scm-6.3.2.tar.gz SOURCES/six-1.16.0.tar.gz -SOURCES/stevedore-3.4.0-py3-none-any.whl SOURCES/tomli-1.0.1.tar.gz -SOURCES/typing_extensions-3.10.0.2.tar.gz SOURCES/urllib3-1.26.7.tar.gz -SOURCES/wcwidth-0.2.5-py2.py3-none-any.whl SOURCES/websocket-client-1.2.1.tar.gz -SOURCES/wheel-0.37.0-py2.py3-none-any.whl -SOURCES/wrapt-1.12.1.tar.gz -SOURCES/zipp-3.6.0.tar.gz diff --git a/SOURCES/bz1886074-3-fence_openstack-bundled.patch b/SOURCES/bz1886074-3-fence_openstack-bundled.patch deleted file mode 100644 index d2c3426..0000000 --- a/SOURCES/bz1886074-3-fence_openstack-bundled.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/agents/openstack/fence_openstack.py 2021-06-03 11:48:01.000000000 +0200 -+++ b/agents/openstack/fence_openstack.py 2021-06-30 09:13:16.598937530 +0200 -@@ -11,6 +11,7 @@ - from fencing import fail_usage, run_delay - - try: -+ sys.path.insert(0, '/usr/lib/fence-agents/bundled/openstack') - from novaclient import client - from novaclient.exceptions import Conflict, NotFound - except ImportError: diff --git a/SOURCES/requirements-openstack.txt b/SOURCES/requirements-openstack.txt deleted file mode 100644 index 97da9af..0000000 --- a/SOURCES/requirements-openstack.txt +++ /dev/null @@ -1,3 +0,0 @@ -python-novaclient -python-keystoneclient -PyYAML==5.1 diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index be3ece8..091209f 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -87,7 +87,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 102%{?alphatag:.%{alphatag}}%{?dist} +Release: 103%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -138,38 +138,6 @@ Source34: setuptools_scm-6.3.2.tar.gz Source35: packaging-21.2-py3-none-any.whl Source36: tomli-1.0.1.tar.gz ### END -# openstack -Source37: requirements-openstack.txt -Source38: PyYAML-5.1.tar.gz -Source39: charset_normalizer-2.0.4-py3-none-any.whl -Source40: debtcollector-2.2.0-py3-none-any.whl -Source41: idna-3.2-py3-none-any.whl -Source42: iso8601-0.1.16-py2.py3-none-any.whl -Source43: keystoneauth1-4.3.1-py3-none-any.whl -Source44: msgpack-1.0.2.tar.gz -Source45: netaddr-0.8.0-py2.py3-none-any.whl -Source46: netifaces-0.11.0.tar.gz -Source47: oslo.config-8.7.1-py3-none-any.whl -Source48: oslo.i18n-5.0.1-py3-none-any.whl -Source49: oslo.serialization-4.2.0-py3-none-any.whl -Source50: oslo.utils-4.10.0-py3-none-any.whl -Source51: os_service_types-1.7.0-py2.py3-none-any.whl -Source52: pbr-5.6.0-py2.py3-none-any.whl -Source53: packaging-21.0-py3-none-any.whl -Source54: prettytable-2.2.0-py3-none-any.whl -Source55: python_keystoneclient-4.2.0-py3-none-any.whl -Source56: python_novaclient-17.5.0-py3-none-any.whl -Source57: requests-2.26.0-py2.py3-none-any.whl -Source58: rfc3986-1.5.0-py2.py3-none-any.whl -Source59: stevedore-3.4.0-py3-none-any.whl -Source60: wcwidth-0.2.5-py2.py3-none-any.whl -Source61: wheel-0.37.0-py2.py3-none-any.whl -Source62: wrapt-1.12.1.tar.gz -Source63: importlib_metadata-4.8.3.tar.gz -Source64: pytz-2022.1.tar.gz -Source65: zipp-3.6.0.tar.gz -Source66: typing_extensions-3.10.0.2.tar.gz -Source67: importlib_resources-5.4.0.tar.gz Patch0: fence_impilan-fence_ilo_ssh-add-ilo5-support.patch Patch1: fence_mpath-watchdog-support.patch @@ -282,16 +250,15 @@ Patch107: bz1977588-5-fence_kubevirt-get-namespace-from-context.patch Patch108: bz2048857-fence_aws-botocore-bundled.patch Patch109: bz1886074-1-fencing-source_env.patch Patch110: bz1886074-2-fence_openstack.patch -Patch111: bz1886074-3-fence_openstack-bundled.patch -Patch112: bz2072421-1-all-agents-unify-ssl-parameters.patch -Patch113: bz2078244-fence_gce-update.patch -Patch114: bz2080994-fence_ibm_vpc-fix-parameters.patch -Patch115: bz2080729-1-fence_apc-fence_ilo_moonshot-import-logging.patch -Patch116: bz2080729-2-fence_lpar-fix-import-fail_usage.patch -Patch117: bz2072421-2-fence_zvmip-connect-error.patch -Patch118: bz2091826-fence_ibm_vpc-add-proxy-support.patch -Patch119: bz2092921-fence_ibm_powervs-proxy-private-api-servers.patch -Patch120: bz1886074-4-fencing-source_env-dont-process-empty-lines.patch +Patch111: bz2072421-1-all-agents-unify-ssl-parameters.patch +Patch112: bz2078244-fence_gce-update.patch +Patch113: bz2080994-fence_ibm_vpc-fix-parameters.patch +Patch114: bz2080729-1-fence_apc-fence_ilo_moonshot-import-logging.patch +Patch115: bz2080729-2-fence_lpar-fix-import-fail_usage.patch +Patch116: bz2072421-2-fence_zvmip-connect-error.patch +Patch117: bz2091826-fence_ibm_vpc-add-proxy-support.patch +Patch118: bz2092921-fence_ibm_powervs-proxy-private-api-servers.patch +Patch119: bz1886074-4-fencing-source_env-dont-process-empty-lines.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,7 +447,7 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja %patch108 -p1 %patch109 -p1 %patch110 -p1 -%patch111 -p1 -F1 +%patch111 -p1 %patch112 -p1 %patch113 -p1 %patch114 -p1 @@ -489,7 +456,6 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja %patch117 -p1 %patch118 -p1 %patch119 -p1 -%patch120 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -594,17 +560,6 @@ popd %{__python3} -m pip install --target %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir}/kubevirt --no-index --find-links %{_sourcedir} openshift rm -rf %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir}/kubevirt/rsa* -# openstack -%ifarch x86_64 ppc64le -%{__python3} -m pip install --user --upgrade --no-index --find-links %{_sourcedir} setuptools - -LIBS="%{_sourcedir}/requirements-openstack.txt" - -for x in $LIBS; do - %{__python3} -m pip install --target %{buildroot}/%{_usr}/lib/%{name}/%{bundled_lib_dir}/$(echo $x | sed -E "s/.*requirements-(.*).txt/\1/") --no-index --find-links %{_sourcedir} -r $x -done -%endif - ## tree fix up # fix libfence permissions chmod 0755 %{buildroot}%{_datadir}/fence/*.py @@ -1293,41 +1248,11 @@ Requires: python3-requests Requires: python-requests %endif Requires: fence-agents-common = %{version}-%{release} -Provides: bundled(python-PyYAML) = 5.1 -Provides: bundled(python-charset-normalizer) = 2.0.4 -Provides: bundled(python-debtcollector) = 2.2.0 -Provides: bundled(python-idna) = 3.2 -Provides: bundled(python-iso8601) = 0.1.16 -Provides: bundled(python-keystoneauth1) = 4.3.1 -Provides: bundled(python-msgpack) = 1.0.2 -Provides: bundled(python-netaddr) = 0.8.0 -Provides: bundled(python-netifaces) = 0.11.0 -Provides: bundled(python-oslo-config) = 8.7.1 -Provides: bundled(python-oslo-i18n) = 5.0.1 -Provides: bundled(python-oslo-serialization) = 4.2.0 -Provides: bundled(python-oslo-utils) = 4.10.0 -Provides: bundled(python-os-service-types) = 1.7.0 -Provides: bundled(python-packaging) = 21.0 -Provides: bundled(python-pbr) = 5.6.0 -Provides: bundled(python-prettytable) = 2.2.0 -Provides: bundled(python-keystoneclient) = 4.2.0 -Provides: bundled(python-novaclient) = 17.5.0 -Provides: bundled(python-requests) = 2.26.0 -Provides: bundled(python-rfc3986) = 1.5.0 -Provides: bundled(python-stevedore) = 3.4.0 -Provides: bundled(python-wcwidth) = 0.2.5 -Provides: bundled(python-wrapt) = 1.12.1 -Provides: bundled(python-importlib-metadata) = 4.8.3 -Provides: bundled(python-pytz) = 2022.1 -Provides: bundled(python-zipp) = 3.6.0 -Provides: bundled(python-typing-extensions) = 3.10.0.2 -Provides: bundled(python-importlib-resources) = 5.4.0 %description openstack Fence agent for OpenStack's Nova service. %files openstack %{_sbindir}/fence_openstack %{_mandir}/man8/fence_openstack.8* -%{_usr}/lib/%{name}/%{bundled_lib_dir}/openstack %endif %package redfish @@ -1514,7 +1439,7 @@ Fence agent for IBM z/VM over IP. %endif %changelog -* Mon Aug 15 2022 Oyvind Albrigtsen - 4.2.1-102 +* Tue Aug 16 2022 Oyvind Albrigtsen - 4.2.1-103 - fence_openstack: new fence agent Resolves: rhbz#1886074