Resolves: rhbz#1989149
This commit is contained in:
Oyvind Albrigtsen
parent
2fc02a0b24
commit
6bc9d6fd63
@ -6,7 +6,7 @@ diff --color -uNr a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -22,7 +22,7 @@ diff --color -uNr a/agents/hpblade/fence_hpblade.py b/agents/hpblade/fence_hpbla
|
||||
|
||||
import sys, re
|
||||
-import pexpect
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -39,7 +39,7 @@ diff --color -uNr a/agents/ilo/fence_ilo.py b/agents/ilo/fence_ilo.py
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -56,7 +56,7 @@ diff --color -uNr a/agents/ldom/fence_ldom.py b/agents/ldom/fence_ldom.py
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -72,11 +72,11 @@ diff --color -uNr a/agents/Makefile.am b/agents/Makefile.am
|
||||
$(eval INPUT=$(subst .delay-check,,$@))
|
||||
FENCE_TEST_ARGS_CISCO_MDS=$$(printf '$(FENCE_TEST_ARGS)' | sed 's#port=1#port=fc1/1#'); \
|
||||
- test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
|
||||
+ test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect /usr/bin/time -p \
|
||||
+ test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common /usr/bin/time -p \
|
||||
sh -c "printf 'delay=10\n $$FENCE_TEST_ARGS_CISCO_MDS' | $(PYTHON) ./$(INPUT)" 2>&1 |\
|
||||
awk -F"[. ]" -vOFS= '/real/ {print $$2,$$3}'` -ge 1000 || ( \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect /usr/bin/time -p \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common /usr/bin/time -p \
|
||||
sh -c "printf "delay=0\n $$FENCE_TEST_ARGS_CISCO_MDS" | $(PYTHON) ./$(INPUT)"; false )
|
||||
|
||||
include $(top_srcdir)/make/fencebuild.mk
|
||||
@ -88,7 +88,7 @@ diff --color -uNr a/agents/netio/fence_netio.py b/agents/netio/fence_netio.py
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -104,7 +104,7 @@ diff --color -uNr a/agents/raritan/fence_raritan.py b/agents/raritan/fence_rarit
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -121,7 +121,7 @@ diff --color -uNr a/agents/sanbox2/fence_sanbox2.py b/agents/sanbox2/fence_sanbo
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -138,7 +138,7 @@ diff --color -uNr a/agents/vmware/fence_vmware.py b/agents/vmware/fence_vmware.p
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -155,7 +155,7 @@ diff --color -uNr a/agents/wti/fence_wti.py b/agents/wti/fence_wti.py
|
||||
|
||||
-import sys, re, pexpect
|
||||
+import sys, re
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -181,7 +181,7 @@ diff --color -uNr a/lib/fencing.py.py b/lib/fencing.py.py
|
||||
|
||||
import sys, getopt, time, os, uuid, pycurl, stat
|
||||
-import pexpect, re, syslog
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -255,7 +255,7 @@ diff --color -uNr a/lib/fencing_snmp.py.py b/lib/fencing_snmp.py.py
|
||||
|
||||
-import re, pexpect
|
||||
+import sys
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/pexpect')
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
+try:
|
||||
+ import pexpect
|
||||
+except:
|
||||
@ -272,10 +272,10 @@ diff --color -uNr a/make/agentpycheck.mk b/make/agentpycheck.mk
|
||||
%.xml-check: %.8
|
||||
$(eval INPUT=$(subst .xml-check,,$(@F)))
|
||||
- for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
TEMPFILE=$$(mktemp); \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $$TEMPFILE && \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $$TEMPFILE && \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $$TEMPFILE && \
|
||||
diff $$TEMPFILE $(DATADIR)/$$x.xml || exit 1 && \
|
||||
rm $$TEMPFILE; \
|
||||
done
|
||||
@ -284,8 +284,8 @@ diff --color -uNr a/make/agentpycheck.mk b/make/agentpycheck.mk
|
||||
$(eval INPUT=$(subst .xml-upload,,$(@F)))
|
||||
- for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$$x.xml; \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$$x.xml; \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$$x.xml; \
|
||||
done
|
||||
|
||||
# If test will fail, rerun fence agents to show problems
|
||||
@ -293,12 +293,12 @@ diff --color -uNr a/make/agentpycheck.mk b/make/agentpycheck.mk
|
||||
$(eval INPUT=$(subst .delay-check,,$(@F)))
|
||||
- for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
- test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect /usr/bin/time -p \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common /usr/bin/time -p \
|
||||
sh -c "printf 'delay=10\n $(FENCE_TEST_ARGS)' | $(PYTHON) $(@D)/$$x" 2>&1 |\
|
||||
awk -F"[. ]" -vOFS= '/real/ {print $$2,$$3}'` -ge 1000 || ( \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect /usr/bin/time -p \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common /usr/bin/time -p \
|
||||
sh -c "printf 'delay=0\n $(FENCE_TEST_ARGS)' | $(PYTHON) $(@D)/$$x"; false ); \
|
||||
done
|
||||
|
||||
@ -306,8 +306,8 @@ diff --color -uNr a/make/agentpycheck.mk b/make/agentpycheck.mk
|
||||
$(eval INPUT=$(subst .rng-check,,$(@F)))
|
||||
- for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@D)/$$x -o metadata | \
|
||||
+ for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@D)/$$x -o metadata | \
|
||||
xsltproc ${abs_top_srcdir}/lib/fence2rng.xsl - | \
|
||||
sed -e 's/ rha:description=/ description=/g' -e 's/ rha:name=/ name=/g' | \
|
||||
xmllint --nsclean --noout -; \
|
||||
@ -319,11 +319,11 @@ diff --color -uNr a/make/fencebuild.mk b/make/fencebuild.mk
|
||||
|
||||
if [ 0 -eq `echo "$(@)" | grep fence_ > /dev/null 2>&1; echo $$?` ]; then \
|
||||
- PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(top_srcdir)/lib/check_used_options.py $@; \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(top_srcdir)/lib/check_used_options.py $@; \
|
||||
+ PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(top_srcdir)/lib/check_used_options.py $@; \
|
||||
else true ; fi
|
||||
|
||||
- for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
cp -f $(@) $(@D)/$$x; \
|
||||
$(MAKE) $(@D)/$$x.8; \
|
||||
done
|
||||
@ -332,7 +332,7 @@ diff --color -uNr a/make/fencebuild.mk b/make/fencebuild.mk
|
||||
for p in $(TARGET); do \
|
||||
dir=`dirname $$p`; \
|
||||
- for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
+ for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||
echo " $(INSTALL_SCRIPT) $$dir/$$x '$(DESTDIR)$(sbindir)'"; \
|
||||
$(INSTALL_SCRIPT) $$dir/$$x "$(DESTDIR)$(sbindir)" || exit $$?; \
|
||||
echo " $(INSTALL_DATA) '$$dir/$$x.8' '$(DESTDIR)$(man8dir)'"; \
|
||||
@ -341,7 +341,7 @@ diff --color -uNr a/make/fencebuild.mk b/make/fencebuild.mk
|
||||
uninstall-hook: $(TARGET)
|
||||
files=`for p in $(TARGET); do \
|
||||
- for x in \`PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
|
||||
+ for x in \`PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/pexpect $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
|
||||
+ for x in \`PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib:$(abs_top_builddir)/support/common $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
|
||||
echo " rm -f '$(DESTDIR)$(sbindir)/$$x'"; \
|
||||
rm -f "$(DESTDIR)$(sbindir)/$$x"; \
|
||||
echo " rm -f '$(DESTDIR)$(man8dir)/$$x.8'"; \
|
||||
@ -352,7 +352,7 @@ diff --color -uNr a/make/fenceman.mk b/make/fenceman.mk
|
||||
%.8: % $(top_srcdir)/lib/fence2man.xsl
|
||||
set -e && \
|
||||
- PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib:$(abs_builddir)/lib \
|
||||
+ PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib:$(abs_builddir)/lib:$(abs_top_builddir)/support/pexpect \
|
||||
+ PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib:$(abs_builddir)/lib:$(abs_top_builddir)/support/common \
|
||||
$(PYTHON) $* -o manpage > $(@D)/.$(@F).tmp && \
|
||||
xmllint --noout --relaxng $(top_srcdir)/lib/metadata.rng $(@D)/.$(@F).tmp && \
|
||||
xsltproc $(top_srcdir)/lib/fence2man.xsl $(@D)/.$(@F).tmp > $@
|
||||
|
||||
10
bundled-suds.patch
Normal file
10
bundled-suds.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- fence-agents-4.10.0/agents/vmware_soap/fence_vmware_soap.py 2021-08-03 13:24:24.969694553 +0200
|
||||
+++ fence-agents-4.10.0/agents/vmware_soap/fence_vmware_soap.py.modif 2021-08-03 13:24:22.780688256 +0200
|
||||
@@ -6,6 +6,7 @@
|
||||
import atexit, signal
|
||||
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||
|
||||
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||
from suds.client import Client
|
||||
from suds.sudsobject import Property
|
||||
from suds.transport.http import HttpAuthenticated
|
||||
@ -9,7 +9,7 @@
|
||||
Name: fence-agents
|
||||
Summary: Set of unified programs capable of host isolation ("fencing")
|
||||
Version: 4.10.0
|
||||
Release: 2%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Release: 3%{?alphatag:.%{alphatag}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/fence-agents
|
||||
Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
|
||||
@ -19,7 +19,7 @@ Source101: requirements-aws.txt
|
||||
Source102: requirements-azure.txt
|
||||
Source103: requirements-google.txt
|
||||
Source104: requirements-openstack.txt
|
||||
Source105: requirements-pexpect.txt
|
||||
Source105: requirements-common.txt
|
||||
### HA support libs/utils ###
|
||||
# awscli 2+ is only available from github (and needs to be renamed from aws-cli... to awscli)
|
||||
Source900: awscli-2.2.15.tar.gz
|
||||
@ -110,9 +110,10 @@ Source1073: python_novaclient-17.5.0-py3-none-any.whl
|
||||
Source1074: stevedore-3.3.0-py3-none-any.whl
|
||||
Source1075: wcwidth-0.2.5-py2.py3-none-any.whl
|
||||
Source1076: wrapt-1.12.1.tar.gz
|
||||
# pexpect
|
||||
# common (pexpect / suds)
|
||||
Source1077: pexpect-4.8.0-py2.py3-none-any.whl
|
||||
Source1078: ptyprocess-0.7.0-py2.py3-none-any.whl
|
||||
Source1079: suds_community-0.8.5-py3-none-any.whl
|
||||
### END ###
|
||||
|
||||
Patch0: ha-cloud-support-aliyun.patch
|
||||
@ -121,6 +122,7 @@ Patch2: ha-cloud-support-azure.patch
|
||||
Patch3: ha-cloud-support-google.patch
|
||||
Patch4: ha-openstack-support.patch
|
||||
Patch5: bundled-pexpect.patch
|
||||
Patch6: bundled-suds.patch
|
||||
|
||||
%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 virt vmware_rest vmware_soap wti
|
||||
%ifarch x86_64
|
||||
@ -188,7 +190,6 @@ BuildRequires: python3-devel python3-pip
|
||||
# wheel for HA support subpackages
|
||||
BuildRequires: python3-wheel
|
||||
BuildRequires: python3-pycurl python3-requests
|
||||
BuildRequires: python3-suds
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7
|
||||
BuildRequires: openwsman-python3
|
||||
%endif
|
||||
@ -198,7 +199,7 @@ BuildRequires: python3-openwsman
|
||||
%else
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-pycurl python-requests
|
||||
BuildRequires: python-suds openwsman-python
|
||||
BuildRequires: openwsman-python
|
||||
%endif
|
||||
|
||||
# fence-virt
|
||||
@ -240,10 +241,10 @@ LIBS="%{_sourcedir}/requirements-*.txt"
|
||||
echo "awscli" >> %{_sourcedir}/requirements-awscli.txt
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
LIBS="%{_sourcedir}/requirements-openstack.txt %{_sourcedir}/requirements-pexpect.txt"
|
||||
LIBS="%{_sourcedir}/requirements-openstack.txt %{_sourcedir}/requirements-common.txt"
|
||||
%endif
|
||||
%ifnarch x86_64 ppc64le
|
||||
LIBS="%{_sourcedir}/requirements-pexpect.txt"
|
||||
LIBS="%{_sourcedir}/requirements-common.txt"
|
||||
%endif
|
||||
for x in $LIBS; do
|
||||
%{__python3} -m pip install --target support/$(echo $x | sed -E "s/.*requirements-(.*).txt/\1/") --no-index --find-links %{_sourcedir} -r $x
|
||||
@ -254,7 +255,7 @@ sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/suppo
|
||||
%endif
|
||||
|
||||
./autogen.sh
|
||||
%{configure} --disable-libvirt-qmf-plugin PYTHONPATH="support/aliyun:support/aws:support/azure:support/google:support/openstack:support/pexpect" --with-agents='%{supportedagents} %{testagents}'
|
||||
%{configure} --disable-libvirt-qmf-plugin PYTHONPATH="support/aliyun:support/aws:support/azure:support/google:support/openstack:support/common" --with-agents='%{supportedagents} %{testagents}'
|
||||
CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -328,9 +329,10 @@ Requires: python3-pycurl
|
||||
%else
|
||||
Requires: python-pycurl
|
||||
%endif
|
||||
# pexpect
|
||||
# pexpect / suds
|
||||
Provides: bundled(python-pexpect) = 4.8.0
|
||||
Provides: bundled(python-ptyprocess) = 0.7.0
|
||||
Provides: bundled(python-suds) = 0.8.5
|
||||
BuildArch: noarch
|
||||
%description common
|
||||
A collection of executables to handle isolation ("fencing") of possibly
|
||||
@ -352,7 +354,7 @@ This package contains support files including the Python fencing library.
|
||||
%exclude %{_sbindir}/*
|
||||
%exclude %{_mandir}/man8/*
|
||||
%dir %{_usr}/lib/%{name}
|
||||
%{_usr}/lib/%{name}/support/pexpect
|
||||
%{_usr}/lib/%{name}/support/common
|
||||
|
||||
%ifarch x86_64
|
||||
%package -n ha-cloud-support
|
||||
@ -431,7 +433,7 @@ Support libraries for Fence Agents.
|
||||
%dir %{_usr}/lib/%{name}
|
||||
%{_usr}/lib/%{name}/support
|
||||
%exclude %{_usr}/lib/%{name}/support/openstack
|
||||
%exclude %{_usr}/lib/%{name}/support/pexpect
|
||||
%exclude %{_usr}/lib/%{name}/support/common
|
||||
%endif
|
||||
|
||||
%ifarch x86_64 ppc64le
|
||||
@ -1115,11 +1117,6 @@ Fence agent for VMWare with REST API.
|
||||
%package vmware-soap
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Summary: Fence agent for VMWare with SOAP API v4.1+
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
|
||||
Requires: python3-suds
|
||||
%else
|
||||
Requires: python-suds
|
||||
%endif
|
||||
Requires: fence-agents-common = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
%description vmware-soap
|
||||
@ -1241,6 +1238,10 @@ are located on corosync cluster nodes.
|
||||
%{_libdir}/fence-virt/cpg.so
|
||||
|
||||
%changelog
|
||||
* Tue Aug 3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-3
|
||||
- remove suds dependency
|
||||
Resolves: rhbz#1989149
|
||||
|
||||
* Mon Jul 26 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-2
|
||||
- new upstream release
|
||||
Resolves: rhbz#1984803
|
||||
|
||||
4
sources
4
sources
@ -7,7 +7,8 @@ SHA512 (requirements-aws.txt) = ca39604d09f4b05589ddaa437be13b7f5d1868218745df10
|
||||
SHA512 (requirements-azure.txt) = a176aeaba7f13ca126bc6b41de1237148480787e4fe56cd9969b843d7102b24cbef2c9f9bd5e4460c603da96ba588639a77dfb376f9ab4ff6f7c2a29013edc31
|
||||
SHA512 (requirements-google.txt) = d916eb72588e55f5243b9e5391ab07d65eaafe583e073ef79d0e865f4c5e911d7b10310f7ccb98b5fdc1383c2214cc0cc082fa3c5fac6aa3d1931e4779149241
|
||||
SHA512 (requirements-openstack.txt) = e4c6ee00ff7bedd0229aa9ba9380cb20891f5fdd35e39bcc9d6c8e21ce9e7fffe18e383a44ea711266d07f47e9ffa3123beeafb14d0c9b62ddb0456b86e57f22
|
||||
SHA512 (requirements-pexpect.txt) = 90995acfe778d9fe42dd1146a1c4bcb9e9e8b4e48cad4809791e4650f7cd45e668aee6add470a1155104ebb24d48e4112a2ca1e5ee27057e99fc61470dfd3cc6
|
||||
SHA512 (requirements-common.txt) = 48725599ca3e019f34ce59b78a6ac1deb0cc459e062cd87d5bc96dc2a47f9ef86cc46d50c318c3cd83765882fab40bdfcc03feff82933ed3bdce35b50fbb696e
|
||||
SHA512 (ptyprocess-0.7.0-py2.py3-none-any.whl) = aa6c925add18a9603f130887e2a0ec645eb5bbf6b8020c78450a7cee934454dc46d1a435068368347f851d45550ea0fda8fb2ba0864c24c41e17a58bc7a9e84f
|
||||
SHA512 (aliyun-python-sdk-core-2.13.35.tar.gz) = 0e73892f23541f74618796f3ee672348c1764feac8c5a4ce8abb1265fba0e53b59a7ac1087ccbf4800b016ae691abd493f3457c2bb4086d5678b2eb0652d11bc
|
||||
SHA512 (aliyun_python_sdk_ecs-4.24.3-py2.py3-none-any.whl) = eff82b13a587f21ef0f7bfb3640ada409ba284d2105e2a6d7d8d6494931d25c3a3471499216346490ec923d903593def4af8838f9067ed18f0f2cc66ed9650ac
|
||||
SHA512 (cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl) = 3c73e06bef8e9646beacc584d59ecf42de013034194d6eb59f1abf279e8fe5468e106fcd47802ce1d264d3c1d9122af3c66ea1229db78a768f7ea069ddc2fd72
|
||||
@ -87,3 +88,4 @@ SHA512 (wcwidth-0.2.5-py2.py3-none-any.whl) = f83eb241322d171ff4014612184b155c43
|
||||
SHA512 (wrapt-1.12.1.tar.gz) = efc38c0adc4fcaa34499a996ea4a337a000a812254ec7ddaca38f0132020dd31afa9fe6bab3e6010df312282ab0ea7bd571b54215d8d27e0b97b270c08cf5a62
|
||||
SHA512 (pexpect-4.8.0-py2.py3-none-any.whl) = 79b3a33866f8fec11a5ccf079387b7de393cdee65167671db0ac42cf3d6c2e544c40ee344c1b5f7deb13d97057300c86f605df30fbfff9c6773944886c5158c0
|
||||
SHA512 (ptyprocess-0.7.0-py2.py3-none-any.whl) = aa6c925add18a9603f130887e2a0ec645eb5bbf6b8020c78450a7cee934454dc46d1a435068368347f851d45550ea0fda8fb2ba0864c24c41e17a58bc7a9e84f
|
||||
SHA512 (suds_community-0.8.5-py3-none-any.whl) = 0719c3c2988ff96bd8698df326fb332f85f830ef8d4bfca13c285cc0e917a6cf575f71a2b037df9270cd64edf2ea543779630f08d9d2eb77b82233ea0c5ac215
|
||||
|
||||
Loading…
Reference in New Issue
Block a user