import fence-agents-4.10.0-9.el9
This commit is contained in:
commit
486485e98b
94
.fence-agents.metadata
Normal file
94
.fence-agents.metadata
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
e1fb5dc6f95a85e7d1f93c6701b331201e8b5479 SOURCES/PyJWT-2.1.0-py3-none-any.whl
|
||||||
|
53fc16036940089ceadd4127381e40fd6106a7ed SOURCES/PyYAML-5.1.tar.gz
|
||||||
|
b53cba68215f389dffaa51ee2afe10c943278646 SOURCES/adal-1.2.7-py2.py3-none-any.whl
|
||||||
|
bda476965c380701795849179ed91e9d8134ec7c SOURCES/aliyun-python-sdk-core-2.11.5.tar.gz
|
||||||
|
2a3e6ee5713a3cfb47e63a739cc9a05580d95dd6 SOURCES/aliyun_python_sdk_ecs-4.24.7-py2.py3-none-any.whl
|
||||||
|
32a9b6bff51343ab89221da66f6f67ba798ddcd6 SOURCES/aliyuncli-2.1.10-py2.py3-none-any.whl
|
||||||
|
459383a3bcb16956030e302008a0f140a5fec0fb SOURCES/awscli-2.2.15.tar.gz
|
||||||
|
a08c16f613cb0b9a9f8ce7cae782ea20c40ce2af SOURCES/awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl
|
||||||
|
70a8e279429feaa0ed39bf2da123e5d53c37b0e6 SOURCES/azure_common-1.1.27-py2.py3-none-any.whl
|
||||||
|
63fee5e61283d1c972abd3786ed609da6fd7ea5b SOURCES/azure_core-1.15.0-py2.py3-none-any.whl
|
||||||
|
584ff1897b56673bee12e77aec07e68ebe9f789b SOURCES/azure_mgmt_compute-21.0.0-py2.py3-none-any.whl
|
||||||
|
e20df6c9635f1db9a3c891b9239b4319d88b1747 SOURCES/azure_mgmt_core-1.2.2-py2.py3-none-any.whl
|
||||||
|
3bb341e87329c7507863f0ec53f8cb6e16d698d6 SOURCES/azure_mgmt_network-19.0.0-py2.py3-none-any.whl
|
||||||
|
6591882be0937b2b900eab4ec70feadf34f71738 SOURCES/boto3-1.17.102-py2.py3-none-any.whl
|
||||||
|
22507f43314ccb2dd203337e87ffafb385ba3627 SOURCES/botocore-1.20.102-py2.py3-none-any.whl
|
||||||
|
6ef53a76455b377b02b4774c32a04e241cdb24eb SOURCES/botocore-2.0.0dev123.zip
|
||||||
|
c953dcd6e69587e5b182d77255ed836172fea70a SOURCES/cachetools-4.2.2-py3-none-any.whl
|
||||||
|
2fcaa39108a9c99700c6f3f4198fcaa47b8ed707 SOURCES/certifi-2021.5.30-py2.py3-none-any.whl
|
||||||
|
17953cc85717e0f4501dbc7b5fb8e75d67dcdcd3 SOURCES/cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl
|
||||||
|
96faab7de7e9a71b37f22adb64daf2898e967e3e SOURCES/chardet-3.0.4-py2.py3-none-any.whl
|
||||||
|
e9eb83c71c09b3c8249bd7d6d2619b65fff03874 SOURCES/chardet-4.0.0-py2.py3-none-any.whl
|
||||||
|
9fa96037a1a985fe7dda81c0e1e35ae015163d88 SOURCES/charset_normalizer-2.0.4-py3-none-any.whl
|
||||||
|
a8ee91adf4644bbdccfc73ead88f4cd0df7e3552 SOURCES/colorama-0.3.3.tar.gz
|
||||||
|
444d5ea320f95cd6205535a1be2805598847191b SOURCES/colorama-0.4.3-py2.py3-none-any.whl
|
||||||
|
536a57d70d505e4de8595650603d7e2ecc58b34b SOURCES/cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl
|
||||||
|
dfabded3494bffe6965b1bf3d37383736e642bdb SOURCES/debtcollector-2.2.0-py3-none-any.whl
|
||||||
|
4b50bebad4c5036c030a78cbb869d039bc91c4ec SOURCES/distro-1.5.0-py2.py3-none-any.whl
|
||||||
|
aafeddc912b74557754b2aaece3f1364be8e9f6a SOURCES/docutils-0.15.2-py3-none-any.whl
|
||||||
|
1ec823f807b73a377cdd47d12e2e34f046bfc889 SOURCES/fence-agents-4.10.0.tar.gz
|
||||||
|
ac160113ba8b78b0688edda9f9a088c0b4b5ded2 SOURCES/google_api_core-1.30.0-py2.py3-none-any.whl
|
||||||
|
4fd1eb2b927767158e91e369de441fd9221a82d9 SOURCES/google_api_python_client-1.12.8-py2.py3-none-any.whl
|
||||||
|
4a3a5ddc3d1ded24279b89d4ea0c8796f6c2598a SOURCES/google_auth-1.32.0-py2.py3-none-any.whl
|
||||||
|
9e513ce4e7b36b8e81c607be440e0d6e6afe9833 SOURCES/google_auth_httplib2-0.1.0-py2.py3-none-any.whl
|
||||||
|
dc553afa7a3f23b92ee9ecd27d0b15153c0e9f75 SOURCES/googleapis_common_protos-1.53.0-py2.py3-none-any.whl
|
||||||
|
74ec77d2e2ef6b2ef8503e6e398faa6f3ba298ae SOURCES/httplib2-0.19.1-py3-none-any.whl
|
||||||
|
999b6718b4d789d8ca0d2ddf7c07826154291825 SOURCES/idna-2.10-py2.py3-none-any.whl
|
||||||
|
e3a19aca36f6631ba9e33e66b855835776e8e120 SOURCES/idna-3.2-py3-none-any.whl
|
||||||
|
8672ed298c51abba24fdf5298ddeef7b16027071 SOURCES/iso8601-0.1.16-py2.py3-none-any.whl
|
||||||
|
240cc4206740fafacb74bbf0d0c4ff70e41c8a85 SOURCES/isodate-0.6.0-py2.py3-none-any.whl
|
||||||
|
68904717c48e95adb47d815178fff8d80f39b2ab SOURCES/jmespath-0.7.1-py2.py3-none-any.whl
|
||||||
|
22a38dbc79cc3cbe53c2bf306ad22a472be1a6f4 SOURCES/keystoneauth1-4.3.1-py3-none-any.whl
|
||||||
|
194b341fe37fe6ce992c637a728484e3cee47394 SOURCES/msgpack-1.0.2.tar.gz
|
||||||
|
ba59fbd147307e7ef92a1fad259e7dc0b07e79e0 SOURCES/msrest-0.6.21-py2.py3-none-any.whl
|
||||||
|
3d65a50b68e3aa506b6af42be485ed2710afa9da SOURCES/msrestazure-0.6.4-py2.py3-none-any.whl
|
||||||
|
ee77c30d5350378e9ca9932b724d1a26c9cc164b SOURCES/netaddr-0.8.0-py2.py3-none-any.whl
|
||||||
|
c1dd2b481a0101eb518bf47bdf40ea53ab61ca62 SOURCES/netifaces-0.11.0.tar.gz
|
||||||
|
0b5ba4c47bdd7ff17ca4954349d7213a95d03f25 SOURCES/oauthlib-3.1.1-py2.py3-none-any.whl
|
||||||
|
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
|
||||||
|
2b10cb7681bc678ba4ff3be524b28d783e4095ce SOURCES/packaging-20.9-py2.py3-none-any.whl
|
||||||
|
f712c7731d0d65cfc8fc7c61afeeeeca4b84b549 SOURCES/packaging-21.0-py3-none-any.whl
|
||||||
|
d3d07b885ca4d10994a30682106e37785e6e780c SOURCES/pbr-5.6.0-py2.py3-none-any.whl
|
||||||
|
0c3fc83ca045abeec9ce82bb7ee3e77f0390bca4 SOURCES/pexpect-4.8.0-py2.py3-none-any.whl
|
||||||
|
5ad34ad3dbfaf6d4e72860287043120c641e4524 SOURCES/prettytable-2.2.0-py3-none-any.whl
|
||||||
|
b09c4655a4c8bd24c54a078e960750ec9e8688d6 SOURCES/prompt_toolkit-2.0.10-py3-none-any.whl
|
||||||
|
5a90b79a9630873c7f2db79544c46146bb6af5e8 SOURCES/protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
|
||||||
|
0827aaa6fdc3dc4256e06fa1c3991fb4ed20a693 SOURCES/ptyprocess-0.7.0-py2.py3-none-any.whl
|
||||||
|
c3c9f195dc89eb6d04828b881314743b548318d0 SOURCES/pyasn1-0.4.8-py2.py3-none-any.whl
|
||||||
|
d77aa46abbcaccc4054a0777a191e427c785c65a SOURCES/pyasn1_modules-0.2.8-py2.py3-none-any.whl
|
||||||
|
a0df3ebc552b551f8e99a05cf0a29ce30bef62ee SOURCES/pycparser-2.20-py2.py3-none-any.whl
|
||||||
|
df33feb2a14904c0461b5dcc3ca31f910206e7bd SOURCES/pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl
|
||||||
|
c8307f47e3b75a2d02af72982a2dfefa3f56e407 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
|
||||||
|
24213006f983ada342ed86ea516028fdbb1ac66f SOURCES/pyroute2-0.6.4.tar.gz
|
||||||
|
a052fefd7a93e1e4b2ca87c6a6c242ae70f97489 SOURCES/pyroute2.core-0.6.4.tar.gz
|
||||||
|
e58f6fa56f1baf766ba147dbc9fbfc67fa92e234 SOURCES/pyroute2.ethtool-0.6.4.tar.gz
|
||||||
|
9de1b2825454872697339a63f4d6d06a5167fb73 SOURCES/pyroute2.ipdb-0.6.4.tar.gz
|
||||||
|
4ce5ab32674f3d2652e2f102b2502af4d499ba6a SOURCES/pyroute2.ipset-0.6.4.tar.gz
|
||||||
|
7dc3c981c9c991990647b74e670115395675fe04 SOURCES/pyroute2.ndb-0.6.4.tar.gz
|
||||||
|
281fe514b28e096f9deb1121ee8340976f47e8c0 SOURCES/pyroute2.nftables-0.6.4.tar.gz
|
||||||
|
7ecab830b1978fbd07d565872731268169847bc4 SOURCES/pyroute2.nslink-0.6.4.tar.gz
|
||||||
|
3005ff67df93ee276fb8631e17c677df852254ad SOURCES/python_dateutil-2.8.1-py2.py3-none-any.whl
|
||||||
|
e10df4212f19d34774bb329e8b497dafa4d099d5 SOURCES/python_keystoneclient-4.2.0-py3-none-any.whl
|
||||||
|
2c61c4407646813e5e5dd6f09586704efca371f0 SOURCES/python_novaclient-17.5.0-py3-none-any.whl
|
||||||
|
b97c6966fb8fd273f0bc8533cf0dee4978b9f373 SOURCES/pytz-2021.1-py2.py3-none-any.whl
|
||||||
|
b1009d9fd6acadc64e1a3cecb6f0083fe047e753 SOURCES/requests-2.25.1-py2.py3-none-any.whl
|
||||||
|
d20e2df000dd43249c3a9eed041f08a812a93423 SOURCES/requests-2.26.0-py2.py3-none-any.whl
|
||||||
|
25d5667d7a61586f5ddaac7e08cc3053db3d8661 SOURCES/requests_oauthlib-1.3.0-py2.py3-none-any.whl
|
||||||
|
b8e2041ff9ad37dba2f78e4b59b57cbed5f1b8ff SOURCES/rfc3986-1.5.0-py2.py3-none-any.whl
|
||||||
|
c0d5be2edf538122d35fe06c29d2d7a5f22f3117 SOURCES/rsa-4.7.2-py3-none-any.whl
|
||||||
|
abf532a0cc31ea224e3895f60025e7466b16d7ae SOURCES/ruamel.yaml-0.15.100.tar.gz
|
||||||
|
d7eb0ced8b9f12005ad6f13035689d5611f8a81a SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
|
||||||
|
0b0fcb339be89ae1b6360dbfb2be2075ae9f84c9 SOURCES/setuptools-57.0.0-py3-none-any.whl
|
||||||
|
79e6f2e4f9e24898f1896df379871b9c9922f147 SOURCES/six-1.16.0-py2.py3-none-any.whl
|
||||||
|
c612ea4b006feec1444ac61c233632f7e4852380 SOURCES/stevedore-3.4.0-py3-none-any.whl
|
||||||
|
47a980b20875d1a1714e921552b5bb0eda190f37 SOURCES/suds_community-0.8.5-py3-none-any.whl
|
||||||
|
83be56610e5f824bb05ff7a5618d6d4df9b6cc08 SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
|
||||||
|
206b17697417cbf5fc55f1e39c7ceb2197fe3e63 SOURCES/urllib3-1.26.6-py2.py3-none-any.whl
|
||||||
|
7126323614cada181bc8b06436e80ef372ff8656 SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl
|
||||||
|
6cbb5d6384f6d2c8667fb3c5710ecf90dbf9e7fc SOURCES/wcwidth-0.2.5-py2.py3-none-any.whl
|
||||||
|
b6c48d8714e043524be7a869d1db0adcd8441cd4 SOURCES/wheel-0.37.0-py2.py3-none-any.whl
|
||||||
|
6c18d34144c6faba208509b8091d35acc9842081 SOURCES/wrapt-1.12.1.tar.gz
|
94
.gitignore
vendored
Normal file
94
.gitignore
vendored
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
SOURCES/PyJWT-2.1.0-py3-none-any.whl
|
||||||
|
SOURCES/PyYAML-5.1.tar.gz
|
||||||
|
SOURCES/adal-1.2.7-py2.py3-none-any.whl
|
||||||
|
SOURCES/aliyun-python-sdk-core-2.11.5.tar.gz
|
||||||
|
SOURCES/aliyun_python_sdk_ecs-4.24.7-py2.py3-none-any.whl
|
||||||
|
SOURCES/aliyuncli-2.1.10-py2.py3-none-any.whl
|
||||||
|
SOURCES/awscli-2.2.15.tar.gz
|
||||||
|
SOURCES/awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl
|
||||||
|
SOURCES/azure_common-1.1.27-py2.py3-none-any.whl
|
||||||
|
SOURCES/azure_core-1.15.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/azure_mgmt_compute-21.0.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/azure_mgmt_core-1.2.2-py2.py3-none-any.whl
|
||||||
|
SOURCES/azure_mgmt_network-19.0.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/boto3-1.17.102-py2.py3-none-any.whl
|
||||||
|
SOURCES/botocore-1.20.102-py2.py3-none-any.whl
|
||||||
|
SOURCES/botocore-2.0.0dev123.zip
|
||||||
|
SOURCES/cachetools-4.2.2-py3-none-any.whl
|
||||||
|
SOURCES/certifi-2021.5.30-py2.py3-none-any.whl
|
||||||
|
SOURCES/cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl
|
||||||
|
SOURCES/chardet-3.0.4-py2.py3-none-any.whl
|
||||||
|
SOURCES/chardet-4.0.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/charset_normalizer-2.0.4-py3-none-any.whl
|
||||||
|
SOURCES/colorama-0.3.3.tar.gz
|
||||||
|
SOURCES/colorama-0.4.3-py2.py3-none-any.whl
|
||||||
|
SOURCES/cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl
|
||||||
|
SOURCES/debtcollector-2.2.0-py3-none-any.whl
|
||||||
|
SOURCES/distro-1.5.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/docutils-0.15.2-py3-none-any.whl
|
||||||
|
SOURCES/fence-agents-4.10.0.tar.gz
|
||||||
|
SOURCES/google_api_core-1.30.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/google_api_python_client-1.12.8-py2.py3-none-any.whl
|
||||||
|
SOURCES/google_auth-1.32.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/google_auth_httplib2-0.1.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/googleapis_common_protos-1.53.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/httplib2-0.19.1-py3-none-any.whl
|
||||||
|
SOURCES/idna-2.10-py2.py3-none-any.whl
|
||||||
|
SOURCES/idna-3.2-py3-none-any.whl
|
||||||
|
SOURCES/iso8601-0.1.16-py2.py3-none-any.whl
|
||||||
|
SOURCES/isodate-0.6.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/jmespath-0.7.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/keystoneauth1-4.3.1-py3-none-any.whl
|
||||||
|
SOURCES/msgpack-1.0.2.tar.gz
|
||||||
|
SOURCES/msrest-0.6.21-py2.py3-none-any.whl
|
||||||
|
SOURCES/msrestazure-0.6.4-py2.py3-none-any.whl
|
||||||
|
SOURCES/netaddr-0.8.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/netifaces-0.11.0.tar.gz
|
||||||
|
SOURCES/oauthlib-3.1.1-py2.py3-none-any.whl
|
||||||
|
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-20.9-py2.py3-none-any.whl
|
||||||
|
SOURCES/packaging-21.0-py3-none-any.whl
|
||||||
|
SOURCES/pbr-5.6.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/pexpect-4.8.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/prettytable-2.2.0-py3-none-any.whl
|
||||||
|
SOURCES/prompt_toolkit-2.0.10-py3-none-any.whl
|
||||||
|
SOURCES/protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
|
||||||
|
SOURCES/ptyprocess-0.7.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/pyasn1-0.4.8-py2.py3-none-any.whl
|
||||||
|
SOURCES/pyasn1_modules-0.2.8-py2.py3-none-any.whl
|
||||||
|
SOURCES/pycparser-2.20-py2.py3-none-any.whl
|
||||||
|
SOURCES/pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl
|
||||||
|
SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
|
||||||
|
SOURCES/pyroute2-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.core-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.ethtool-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.ipdb-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.ipset-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.ndb-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.nftables-0.6.4.tar.gz
|
||||||
|
SOURCES/pyroute2.nslink-0.6.4.tar.gz
|
||||||
|
SOURCES/python_dateutil-2.8.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/python_keystoneclient-4.2.0-py3-none-any.whl
|
||||||
|
SOURCES/python_novaclient-17.5.0-py3-none-any.whl
|
||||||
|
SOURCES/pytz-2021.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/requests-2.25.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/requests-2.26.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/requests_oauthlib-1.3.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/rfc3986-1.5.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/rsa-4.7.2-py3-none-any.whl
|
||||||
|
SOURCES/ruamel.yaml-0.15.100.tar.gz
|
||||||
|
SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
|
||||||
|
SOURCES/setuptools-57.0.0-py3-none-any.whl
|
||||||
|
SOURCES/six-1.16.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/stevedore-3.4.0-py3-none-any.whl
|
||||||
|
SOURCES/suds_community-0.8.5-py3-none-any.whl
|
||||||
|
SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/urllib3-1.26.6-py2.py3-none-any.whl
|
||||||
|
SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl
|
||||||
|
SOURCES/wcwidth-0.2.5-py2.py3-none-any.whl
|
||||||
|
SOURCES/wheel-0.37.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/wrapt-1.12.1.tar.gz
|
358
SOURCES/bundled-pexpect.patch
Normal file
358
SOURCES/bundled-pexpect.patch
Normal file
@ -0,0 +1,358 @@
|
|||||||
|
diff --color -uNr a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py
|
||||||
|
--- a/agents/azure_arm/fence_azure_arm.py 2020-06-30 11:26:43.000000000 +0200
|
||||||
|
+++ b/agents/azure_arm/fence_azure_arm.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -1,6 +1,11 @@
|
||||||
|
#!@PYTHON@ -tt
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import logging
|
||||||
|
import atexit
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
diff --color -uNr a/agents/hpblade/fence_hpblade.py b/agents/hpblade/fence_hpblade.py
|
||||||
|
--- a/agents/hpblade/fence_hpblade.py 2019-08-16 10:55:11.000000000 +0200
|
||||||
|
+++ b/agents/hpblade/fence_hpblade.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -8,7 +8,11 @@
|
||||||
|
#####
|
||||||
|
|
||||||
|
import sys, re
|
||||||
|
-import pexpect
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
diff --color -uNr a/agents/ilo/fence_ilo.py b/agents/ilo/fence_ilo.py
|
||||||
|
--- a/agents/ilo/fence_ilo.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/agents/ilo/fence_ilo.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -11,7 +11,12 @@
|
||||||
|
## iLO2 / firmware 1.50 / RIBCL 2.22
|
||||||
|
#####
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
from xml.sax.saxutils import quoteattr
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
diff --color -uNr a/agents/ldom/fence_ldom.py b/agents/ldom/fence_ldom.py
|
||||||
|
--- a/agents/ldom/fence_ldom.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/agents/ldom/fence_ldom.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -7,7 +7,12 @@
|
||||||
|
##
|
||||||
|
#####
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
diff --color -uNr a/agents/Makefile.am b/agents/Makefile.am
|
||||||
|
--- a/agents/Makefile.am 2021-03-16 12:26:37.000000000 +0100
|
||||||
|
+++ b/agents/Makefile.am 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -112,10 +112,10 @@
|
||||||
|
cisco_mds/fence_cisco_mds.delay-check: cisco_mds/fence_cisco_mds
|
||||||
|
$(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/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/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
|
||||||
|
diff --color -uNr a/agents/netio/fence_netio.py b/agents/netio/fence_netio.py
|
||||||
|
--- a/agents/netio/fence_netio.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/agents/netio/fence_netio.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -1,6 +1,11 @@
|
||||||
|
#!@PYTHON@ -tt
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
diff --color -uNr a/agents/raritan/fence_raritan.py b/agents/raritan/fence_raritan.py
|
||||||
|
--- a/agents/raritan/fence_raritan.py 2019-08-16 10:55:11.000000000 +0200
|
||||||
|
+++ b/agents/raritan/fence_raritan.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -1,6 +1,11 @@
|
||||||
|
#!@PYTHON@ -tt
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
diff --color -uNr a/agents/sanbox2/fence_sanbox2.py b/agents/sanbox2/fence_sanbox2.py
|
||||||
|
--- a/agents/sanbox2/fence_sanbox2.py 2019-02-11 13:05:48.000000000 +0100
|
||||||
|
+++ b/agents/sanbox2/fence_sanbox2.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -8,7 +8,12 @@
|
||||||
|
## +-----------------+---------------------------+
|
||||||
|
#####
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import logging
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
diff --color -uNr a/agents/vmware/fence_vmware.py b/agents/vmware/fence_vmware.py
|
||||||
|
--- a/agents/vmware/fence_vmware.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/agents/vmware/fence_vmware.py 2021-06-03 13:16:16.547120822 +0200
|
||||||
|
@@ -22,7 +22,12 @@
|
||||||
|
# VMware vCenter 4.0.0
|
||||||
|
#
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import logging
|
||||||
|
import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
diff --color -uNr a/agents/wti/fence_wti.py b/agents/wti/fence_wti.py
|
||||||
|
--- a/agents/wti/fence_wti.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/agents/wti/fence_wti.py 2021-06-03 13:17:33.435380703 +0200
|
||||||
|
@@ -11,12 +11,21 @@
|
||||||
|
## WTI IPS-800-CE v1.40h (no username) ('list' tested)
|
||||||
|
#####
|
||||||
|
|
||||||
|
-import sys, re, pexpect
|
||||||
|
+import sys, re
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
import atexit
|
||||||
|
import time
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
-from fencing import fspawn, fail, fail_usage, EC_LOGIN_DENIED
|
||||||
|
+from fencing import fail, fail_usage, EC_LOGIN_DENIED
|
||||||
|
+try:
|
||||||
|
+ from fencing import fspawn
|
||||||
|
+except ImportError:
|
||||||
|
+ pass
|
||||||
|
|
||||||
|
def get_listing(conn, options, listing_command):
|
||||||
|
listing = ""
|
||||||
|
diff --color -uNr a/lib/fencing.py.py b/lib/fencing.py.py
|
||||||
|
--- a/lib/fencing.py.py 2021-06-03 10:34:00.000000000 +0200
|
||||||
|
+++ b/lib/fencing.py.py 2021-06-03 13:16:16.548120826 +0200
|
||||||
|
@@ -1,7 +1,12 @@
|
||||||
|
#!@PYTHON@ -tt
|
||||||
|
|
||||||
|
import sys, getopt, time, os, uuid, pycurl, stat
|
||||||
|
-import pexpect, re, syslog
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
+import re, syslog
|
||||||
|
import logging
|
||||||
|
import subprocess
|
||||||
|
import threading
|
||||||
|
@@ -491,29 +496,32 @@
|
||||||
|
"snmpset_path", "snmpget_path", "snmpwalk_path"]
|
||||||
|
}
|
||||||
|
|
||||||
|
-class fspawn(pexpect.spawn):
|
||||||
|
- def __init__(self, options, command, **kwargs):
|
||||||
|
- if sys.version_info[0] > 2:
|
||||||
|
- kwargs.setdefault('encoding', 'utf-8')
|
||||||
|
- logging.info("Running command: %s", command)
|
||||||
|
- pexpect.spawn.__init__(self, command, **kwargs)
|
||||||
|
- self.opt = options
|
||||||
|
-
|
||||||
|
- def log_expect(self, pattern, timeout):
|
||||||
|
- result = self.expect(pattern, timeout if timeout != 0 else None)
|
||||||
|
- logging.debug("Received: %s", self.before + self.after)
|
||||||
|
- return result
|
||||||
|
-
|
||||||
|
- def read_nonblocking(self, size, timeout):
|
||||||
|
- return pexpect.spawn.read_nonblocking(self, size=100, timeout=timeout if timeout != 0 else None)
|
||||||
|
-
|
||||||
|
- def send(self, message):
|
||||||
|
- logging.debug("Sent: %s", message)
|
||||||
|
- return pexpect.spawn.send(self, message)
|
||||||
|
-
|
||||||
|
- # send EOL according to what was detected in login process (telnet)
|
||||||
|
- def send_eol(self, message):
|
||||||
|
- return self.send(message + self.opt["eol"])
|
||||||
|
+try:
|
||||||
|
+ class fspawn(pexpect.spawn):
|
||||||
|
+ def __init__(self, options, command, **kwargs):
|
||||||
|
+ if sys.version_info[0] > 2:
|
||||||
|
+ kwargs.setdefault('encoding', 'utf-8')
|
||||||
|
+ logging.info("Running command: %s", command)
|
||||||
|
+ pexpect.spawn.__init__(self, command, **kwargs)
|
||||||
|
+ self.opt = options
|
||||||
|
+
|
||||||
|
+ def log_expect(self, pattern, timeout):
|
||||||
|
+ result = self.expect(pattern, timeout if timeout != 0 else None)
|
||||||
|
+ logging.debug("Received: %s", self.before + self.after)
|
||||||
|
+ return result
|
||||||
|
+
|
||||||
|
+ def read_nonblocking(self, size, timeout):
|
||||||
|
+ return pexpect.spawn.read_nonblocking(self, size=100, timeout=timeout if timeout != 0 else None)
|
||||||
|
+
|
||||||
|
+ def send(self, message):
|
||||||
|
+ logging.debug("Sent: %s", message)
|
||||||
|
+ return pexpect.spawn.send(self, message)
|
||||||
|
+
|
||||||
|
+ # send EOL according to what was detected in login process (telnet)
|
||||||
|
+ def send_eol(self, message):
|
||||||
|
+ return self.send(message + self.opt["eol"])
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
|
||||||
|
def frun(command, timeout=30, withexitstatus=False, events=None,
|
||||||
|
extra_args=None, logfile=None, cwd=None, env=None, **kwargs):
|
||||||
|
diff --color -uNr a/lib/fencing_snmp.py.py b/lib/fencing_snmp.py.py
|
||||||
|
--- a/lib/fencing_snmp.py.py 2019-02-04 09:45:05.000000000 +0100
|
||||||
|
+++ b/lib/fencing_snmp.py.py 2021-06-03 13:16:16.548120826 +0200
|
||||||
|
@@ -2,7 +2,13 @@
|
||||||
|
|
||||||
|
# For example of use please see fence_cisco_mds
|
||||||
|
|
||||||
|
-import re, pexpect
|
||||||
|
+import sys
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
+try:
|
||||||
|
+ import pexpect
|
||||||
|
+except:
|
||||||
|
+ pass
|
||||||
|
+import re
|
||||||
|
import logging
|
||||||
|
from fencing import *
|
||||||
|
from fencing import fail, fail_usage, EC_TIMED_OUT, run_delay, frun
|
||||||
|
diff --color -uNr a/make/agentpycheck.mk b/make/agentpycheck.mk
|
||||||
|
--- a/make/agentpycheck.mk 2020-06-30 11:26:43.000000000 +0200
|
||||||
|
+++ b/make/agentpycheck.mk 2021-06-03 13:16:16.548120826 +0200
|
||||||
|
@@ -9,34 +9,34 @@
|
||||||
|
|
||||||
|
%.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/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/common $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $$TEMPFILE && \
|
||||||
|
diff $$TEMPFILE $(DATADIR)/$$x.xml || exit 1 && \
|
||||||
|
rm $$TEMPFILE; \
|
||||||
|
done
|
||||||
|
|
||||||
|
%.xml-upload: %.8
|
||||||
|
$(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/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
|
||||||
|
%.delay-check: %
|
||||||
|
$(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/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/common /usr/bin/time -p \
|
||||||
|
sh -c "printf 'delay=0\n $(FENCE_TEST_ARGS)' | $(PYTHON) $(@D)/$$x"; false ); \
|
||||||
|
done
|
||||||
|
|
||||||
|
%.rng-check: %
|
||||||
|
$(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/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 -; \
|
||||||
|
diff --color -uNr a/make/fencebuild.mk b/make/fencebuild.mk
|
||||||
|
--- a/make/fencebuild.mk 2021-03-16 09:32:22.000000000 +0100
|
||||||
|
+++ b/make/fencebuild.mk 2021-06-03 13:16:16.548120826 +0200
|
||||||
|
@@ -34,10 +34,10 @@
|
||||||
|
> $@
|
||||||
|
|
||||||
|
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/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/common $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
||||||
|
cp -f $(@) $(@D)/$$x; \
|
||||||
|
$(MAKE) $(@D)/$$x.8; \
|
||||||
|
done
|
||||||
|
@@ -64,7 +64,7 @@
|
||||||
|
fi
|
||||||
|
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/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)'"; \
|
||||||
|
@@ -74,7 +74,7 @@
|
||||||
|
|
||||||
|
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/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'"; \
|
||||||
|
diff --color -uNr a/make/fenceman.mk b/make/fenceman.mk
|
||||||
|
--- a/make/fenceman.mk 2021-03-11 16:10:15.000000000 +0100
|
||||||
|
+++ b/make/fenceman.mk 2021-06-03 13:16:16.548120826 +0200
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
%.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/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
SOURCES/bundled-suds.patch
Normal file
10
SOURCES/bundled-suds.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- a/agents/vmware_soap/fence_vmware_soap.py 2021-08-24 15:38:05.145039598 +0200
|
||||||
|
+++ b/agents/vmware_soap/fence_vmware_soap.py 2021-08-24 15:37:51.885003751 +0200
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
#!@PYTHON@ -tt
|
||||||
|
|
||||||
|
import sys
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/common')
|
||||||
|
import shutil, tempfile, suds
|
||||||
|
import logging, requests
|
||||||
|
import atexit, signal
|
10
SOURCES/ha-cloud-support-aliyun.patch
Normal file
10
SOURCES/ha-cloud-support-aliyun.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- a/agents/aliyun/fence_aliyun.py 2021-02-08 16:27:46.587068911 +0100
|
||||||
|
+++ b/agents/aliyun/fence_aliyun.py 2021-02-08 16:27:41.368054268 +0100
|
||||||
|
@@ -9,6 +9,7 @@
|
||||||
|
from fencing import fail, fail_usage, EC_TIMED_OUT, run_delay
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/support/aliyun')
|
||||||
|
from aliyunsdkcore import client
|
||||||
|
from aliyunsdkcore.auth.credentials import EcsRamRoleCredential
|
||||||
|
from aliyunsdkecs.request.v20140526.DescribeInstancesRequest import DescribeInstancesRequest
|
10
SOURCES/ha-cloud-support-aws.patch
Normal file
10
SOURCES/ha-cloud-support-aws.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- a/agents/aws/fence_aws.py 2021-02-08 13:31:49.748362643 +0100
|
||||||
|
+++ b/agents/aws/fence_aws.py 2021-02-08 13:31:46.836356513 +0100
|
||||||
|
@@ -11,6 +11,7 @@
|
||||||
|
from requests import HTTPError
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/support/aws')
|
||||||
|
import boto3
|
||||||
|
from botocore.exceptions import ConnectionError, ClientError, EndpointConnectionError, NoRegionError
|
||||||
|
except ImportError:
|
12
SOURCES/ha-cloud-support-azure.patch
Normal file
12
SOURCES/ha-cloud-support-azure.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- fence-agents-4.7.1/lib/azure_fence.py.py 2021-02-08 16:52:32.955244393 +0100
|
||||||
|
+++ fence-agents-4.7.1/lib/azure_fence.py.py.modif 2021-02-08 16:52:28.150234151 +0100
|
||||||
|
@@ -1,6 +1,9 @@
|
||||||
|
import logging, re, time
|
||||||
|
from fencing import fail_usage
|
||||||
|
|
||||||
|
+import sys
|
||||||
|
+sys.path.insert(0, '/usr/lib/fence-agents/support/azure')
|
||||||
|
+
|
||||||
|
FENCE_SUBNET_NAME = "fence-subnet"
|
||||||
|
FENCE_INBOUND_RULE_NAME = "FENCE_DENY_ALL_INBOUND"
|
||||||
|
FENCE_INBOUND_RULE_DIRECTION = "Inbound"
|
21
SOURCES/ha-cloud-support-google.patch
Normal file
21
SOURCES/ha-cloud-support-google.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --color -uNr a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py
|
||||||
|
--- a/agents/gce/fence_gce.py 2021-06-03 13:10:44.752999470 +0200
|
||||||
|
+++ b/agents/gce/fence_gce.py 2021-06-03 13:10:36.512971619 +0200
|
||||||
|
@@ -9,7 +9,6 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
import atexit
|
||||||
|
-import httplib2
|
||||||
|
import logging
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
@@ -30,6 +29,8 @@
|
||||||
|
|
||||||
|
from fencing import fail_usage, run_delay, all_opt, atexit_handler, check_input, process_input, show_docs, fence_action
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/support/google')
|
||||||
|
+ import httplib2
|
||||||
|
import googleapiclient.discovery
|
||||||
|
import socks
|
||||||
|
try:
|
||||||
|
Binary files a/agents/gce/.fence_gce.py.swp and b/agents/gce/.fence_gce.py.swp differ
|
30
SOURCES/ha-openstack-support.patch
Normal file
30
SOURCES/ha-openstack-support.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
--- a/agents/compute/fence_compute.py 2021-03-04 15:11:13.867362945 +0100
|
||||||
|
+++ b/agents/compute/fence_compute.py 2021-03-04 15:11:11.480357409 +0100
|
||||||
|
@@ -253,6 +253,7 @@
|
||||||
|
nova = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/support/openstack')
|
||||||
|
from novaclient import client
|
||||||
|
from novaclient.exceptions import NotAcceptable
|
||||||
|
except ImportError:
|
||||||
|
--- a/agents/evacuate/fence_evacuate.py 2021-03-04 15:11:48.267442726 +0100
|
||||||
|
+++ b/agents/evacuate/fence_evacuate.py 2021-03-04 15:11:45.397436069 +0100
|
||||||
|
@@ -189,6 +189,7 @@
|
||||||
|
nova = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/support/openstack')
|
||||||
|
from novaclient import client
|
||||||
|
from novaclient.exceptions import NotAcceptable
|
||||||
|
except ImportError:
|
||||||
|
--- 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/support/openstack')
|
||||||
|
from novaclient import client
|
||||||
|
from novaclient.exceptions import Conflict, NotFound
|
||||||
|
except ImportError:
|
3
SOURCES/requirements-aliyun.txt
Normal file
3
SOURCES/requirements-aliyun.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
aliyun-python-sdk-ecs
|
||||||
|
# for resource-agents-cloud
|
||||||
|
aliyuncli>=2.1.5
|
2
SOURCES/requirements-aws.txt
Normal file
2
SOURCES/requirements-aws.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
boto3
|
||||||
|
jmespath<1.0.0
|
3
SOURCES/requirements-azure.txt
Normal file
3
SOURCES/requirements-azure.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
azure-mgmt-compute
|
||||||
|
azure-mgmt-network
|
||||||
|
msrestazure
|
2
SOURCES/requirements-common.txt
Normal file
2
SOURCES/requirements-common.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
pexpect
|
||||||
|
suds-community
|
4
SOURCES/requirements-google.txt
Normal file
4
SOURCES/requirements-google.txt
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
google-api-python-client==1.12.8
|
||||||
|
chardet<4.0
|
||||||
|
# for gcp-vpc-move-route
|
||||||
|
pyroute2
|
3
SOURCES/requirements-openstack.txt
Normal file
3
SOURCES/requirements-openstack.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
python-novaclient
|
||||||
|
python-keystoneclient
|
||||||
|
PyYAML==5.1
|
1547
SPECS/fence-agents.spec
Normal file
1547
SPECS/fence-agents.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user