import fence-agents-4.10.0-20.el9_0
This commit is contained in:
commit
46355fc3ba
123
.fence-agents.metadata
Normal file
123
.fence-agents.metadata
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
3297473a9d57e93ff378eab173990c1b64673c01 SOURCES/Jinja2-3.0.2.tar.gz
|
||||||
|
e1b766b2b1601fde67b3b19ed2f13b9746bb1cca SOURCES/MarkupSafe-2.0.1.tar.gz
|
||||||
|
e1fb5dc6f95a85e7d1f93c6701b331201e8b5479 SOURCES/PyJWT-2.1.0-py3-none-any.whl
|
||||||
|
53fc16036940089ceadd4127381e40fd6106a7ed SOURCES/PyYAML-5.1.tar.gz
|
||||||
|
a8c40a3ae9d4c159382a58db3153d83e5521c51e SOURCES/PyYAML-6.0.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
|
||||||
|
0d12f48faa727f0979e9ad5c4c80dfa32b73caff SOURCES/cachetools-4.2.4.tar.gz
|
||||||
|
b13e22d55867e2ca5f92e5289cfdc21ba6e343aa SOURCES/certifi-2021.10.8.tar.gz
|
||||||
|
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
|
||||||
|
865df92e66e5dc7b940144cbad8115c07dc8784f SOURCES/charset-normalizer-2.0.7.tar.gz
|
||||||
|
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
|
||||||
|
f4e578dc0ed68d6667d7b36cdfc2647d55e9858f SOURCES/google-auth-2.3.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
|
||||||
|
08c0449533fc94462f78652dea209099754d9ee4 SOURCES/idna-3.3.tar.gz
|
||||||
|
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
|
||||||
|
d06a9547b1a87e9c51b0a7c708189d993f2e3d89 SOURCES/kubernetes-12.0.1.tar.gz
|
||||||
|
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
|
||||||
|
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
|
||||||
|
2b10cb7681bc678ba4ff3be524b28d783e4095ce SOURCES/packaging-20.9-py2.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
|
||||||
|
0c3fc83ca045abeec9ce82bb7ee3e77f0390bca4 SOURCES/pexpect-4.8.0-py2.py3-none-any.whl
|
||||||
|
18659a0dea5600df33eab90dec1b597e2437aebd SOURCES/poetry-core-1.0.7.tar.gz
|
||||||
|
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
|
||||||
|
e0fa19f8fda46a1fa2253477499b116b33f67175 SOURCES/pyasn1-0.4.8.tar.gz
|
||||||
|
43b89feb6864fe359aae89120627165219de313b SOURCES/pyasn1-modules-0.2.8.tar.gz
|
||||||
|
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
|
||||||
|
6082312a090f5be5e796e0854294da0738ec0379 SOURCES/pyparsing-3.0.1.tar.gz
|
||||||
|
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
|
||||||
|
c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 SOURCES/python-dateutil-2.8.2.tar.gz
|
||||||
|
1dc2fa004aa6517f1620e55d8a7b8e68a9cf2a47 SOURCES/python-string-utils-1.0.0.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
|
||||||
|
8c7a89d183d3e9b70bf91ba5b75eccf7111b9d8d SOURCES/requests-2.26.0.tar.gz
|
||||||
|
f139aed770519b6a095b8fdc888d03955cbe9d8e SOURCES/requests-oauthlib-1.3.0.tar.gz
|
||||||
|
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
|
||||||
|
e8a53067e03fe1b6682fd99a40a7359396a06daa SOURCES/rsa-4.7.2.tar.gz
|
||||||
|
abf532a0cc31ea224e3895f60025e7466b16d7ae SOURCES/ruamel.yaml-0.15.100.tar.gz
|
||||||
|
d1011ff44cd5a045de0460c1b79ec65592e86860 SOURCES/ruamel.yaml-0.17.16.tar.gz
|
||||||
|
27de97227bbbde5a9f571f9fad223578d7bdf7cc SOURCES/ruamel.yaml.clib-0.2.6.tar.gz
|
||||||
|
d7eb0ced8b9f12005ad6f13035689d5611f8a81a SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
|
||||||
|
0b0fcb339be89ae1b6360dbfb2be2075ae9f84c9 SOURCES/setuptools-57.0.0-py3-none-any.whl
|
||||||
|
d5354718cb8c9330d3abc27445467ce8a5ed9d70 SOURCES/setuptools-58.3.0.tar.gz
|
||||||
|
a4f02fddae697614e356cadfddb6241cc7737f38 SOURCES/setuptools_scm-6.3.2.tar.gz
|
||||||
|
79e6f2e4f9e24898f1896df379871b9c9922f147 SOURCES/six-1.16.0-py2.py3-none-any.whl
|
||||||
|
06fa0bb50f2a4e2917fd14c21e9d2d5508ce0163 SOURCES/six-1.16.0.tar.gz
|
||||||
|
c612ea4b006feec1444ac61c233632f7e4852380 SOURCES/stevedore-3.4.0-py3-none-any.whl
|
||||||
|
47a980b20875d1a1714e921552b5bb0eda190f37 SOURCES/suds_community-0.8.5-py3-none-any.whl
|
||||||
|
b42b7960047441db7dc021cc20e14279bd836f8d SOURCES/tomli-1.0.1.tar.gz
|
||||||
|
83be56610e5f824bb05ff7a5618d6d4df9b6cc08 SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
|
||||||
|
206b17697417cbf5fc55f1e39c7ceb2197fe3e63 SOURCES/urllib3-1.26.6-py2.py3-none-any.whl
|
||||||
|
eb35c3fd8b0867ae988a15917d6b80e8bdf60222 SOURCES/urllib3-1.26.7.tar.gz
|
||||||
|
7126323614cada181bc8b06436e80ef372ff8656 SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl
|
||||||
|
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
|
123
.gitignore
vendored
Normal file
123
.gitignore
vendored
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
SOURCES/Jinja2-3.0.2.tar.gz
|
||||||
|
SOURCES/MarkupSafe-2.0.1.tar.gz
|
||||||
|
SOURCES/PyJWT-2.1.0-py3-none-any.whl
|
||||||
|
SOURCES/PyYAML-5.1.tar.gz
|
||||||
|
SOURCES/PyYAML-6.0.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/cachetools-4.2.4.tar.gz
|
||||||
|
SOURCES/certifi-2021.10.8.tar.gz
|
||||||
|
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.7.tar.gz
|
||||||
|
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-auth-2.3.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/idna-3.3.tar.gz
|
||||||
|
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/kubernetes-12.0.1.tar.gz
|
||||||
|
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/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-20.9-py2.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/pexpect-4.8.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/poetry-core-1.0.7.tar.gz
|
||||||
|
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-0.4.8.tar.gz
|
||||||
|
SOURCES/pyasn1-modules-0.2.8.tar.gz
|
||||||
|
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/pyparsing-3.0.1.tar.gz
|
||||||
|
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.2.tar.gz
|
||||||
|
SOURCES/python-string-utils-1.0.0.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-2.26.0.tar.gz
|
||||||
|
SOURCES/requests-oauthlib-1.3.0.tar.gz
|
||||||
|
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/rsa-4.7.2.tar.gz
|
||||||
|
SOURCES/ruamel.yaml-0.15.100.tar.gz
|
||||||
|
SOURCES/ruamel.yaml-0.17.16.tar.gz
|
||||||
|
SOURCES/ruamel.yaml.clib-0.2.6.tar.gz
|
||||||
|
SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
|
||||||
|
SOURCES/setuptools-57.0.0-py3-none-any.whl
|
||||||
|
SOURCES/setuptools-58.3.0.tar.gz
|
||||||
|
SOURCES/setuptools_scm-6.3.2.tar.gz
|
||||||
|
SOURCES/six-1.16.0-py2.py3-none-any.whl
|
||||||
|
SOURCES/six-1.16.0.tar.gz
|
||||||
|
SOURCES/stevedore-3.4.0-py3-none-any.whl
|
||||||
|
SOURCES/suds_community-0.8.5-py3-none-any.whl
|
||||||
|
SOURCES/tomli-1.0.1.tar.gz
|
||||||
|
SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
|
||||||
|
SOURCES/urllib3-1.26.6-py2.py3-none-any.whl
|
||||||
|
SOURCES/urllib3-1.26.7.tar.gz
|
||||||
|
SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl
|
||||||
|
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
|
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
|
24
SOURCES/bz2000954-1-configure-fix-virt.patch
Normal file
24
SOURCES/bz2000954-1-configure-fix-virt.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From 52de83b30a8eea638b01f649f4884f50417121c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Mon, 8 Nov 2021 09:55:11 +0100
|
||||||
|
Subject: [PATCH] configure: fix --with-agents to not match *virt in regex
|
||||||
|
|
||||||
|
---
|
||||||
|
configure.ac | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 7aa51e75d..76aec7186 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -173,8 +173,8 @@ if echo "$AGENTS_LIST" | grep -q -E "all|zvm( |$)"; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
FENCE_VIRT=0
|
||||||
|
-if echo "$AGENTS_LIST" | grep -q -E "all|virt( |$)"; then
|
||||||
|
- AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s/virt( |$)//")
|
||||||
|
+if echo "$AGENTS_LIST" | grep -q -E "all|(^| )virt( |$)"; then
|
||||||
|
+ AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s/(^| )virt( |$)//")
|
||||||
|
case "$host_os" in
|
||||||
|
*bsd*)
|
||||||
|
;;
|
160
SOURCES/bz2000954-2-fence_kubevirt.patch
Normal file
160
SOURCES/bz2000954-2-fence_kubevirt.patch
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
--- fence-agents-4.10.0/agents/kubevirt/fence_kubevirt.py 2021-07-08 13:09:05.000000000 +0200
|
||||||
|
+++ /home/oalbrigt/rhpkg/fence-agents-8.6/fence-agents-4.2.1/agents/kubevirt/fence_kubevirt.py 2021-11-02 15:35:46.217440426 +0100
|
||||||
|
@@ -2,24 +2,25 @@
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import logging
|
||||||
|
+import atexit
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
-from fencing import fail, fail_usage, run_delay, EC_STATUS
|
||||||
|
+from fencing import fail, fail_usage, run_delay, EC_STATUS, EC_FETCH_VM_UUID
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ sys.path.insert(0, '/usr/lib/fence-agents/bundled/kubevirt')
|
||||||
|
from kubernetes.client.exceptions import ApiException
|
||||||
|
except ImportError:
|
||||||
|
logging.error("Couldn\'t import kubernetes.client.exceptions.ApiException - not found or not accessible")
|
||||||
|
|
||||||
|
-API_VERSION='kubevirt.io/v1'
|
||||||
|
-
|
||||||
|
def get_nodes_list(conn, options):
|
||||||
|
logging.debug("Starting list/monitor operation")
|
||||||
|
result = {}
|
||||||
|
try:
|
||||||
|
+ apiversion = options.get("--apiversion")
|
||||||
|
namespace = options.get("--namespace")
|
||||||
|
include_uninitialized = True
|
||||||
|
- vm_api = conn.resources.get(api_version=API_VERSION, kind='VirtualMachine')
|
||||||
|
+ vm_api = conn.resources.get(api_version=apiversion, kind='VirtualMachine')
|
||||||
|
vm_list = vm_api.get(namespace=namespace)
|
||||||
|
for vm in vm_list.items:
|
||||||
|
result[vm.metadata.name] = ("", None)
|
||||||
|
@@ -30,18 +31,21 @@
|
||||||
|
def get_power_status(conn, options):
|
||||||
|
logging.debug("Starting get status operation")
|
||||||
|
try:
|
||||||
|
+ apiversion = options.get("--apiversion")
|
||||||
|
namespace = options.get("--namespace")
|
||||||
|
name = options.get("--plug")
|
||||||
|
- vmi_api = conn.resources.get(api_version=API_VERSION,
|
||||||
|
+ vmi_api = conn.resources.get(api_version=apiversion,
|
||||||
|
kind='VirtualMachineInstance')
|
||||||
|
vmi = vmi_api.get(name=name, namespace=namespace)
|
||||||
|
- if vmi is not None:
|
||||||
|
- phase = vmi.status.phase
|
||||||
|
- if phase == "Running":
|
||||||
|
- return "on"
|
||||||
|
- return "off"
|
||||||
|
+ return translate_status(vmi.status.phase)
|
||||||
|
except ApiException as e:
|
||||||
|
if e.status == 404:
|
||||||
|
+ try:
|
||||||
|
+ vm_api = conn.resources.get(api_version=apiversion, kind='VirtualMachine')
|
||||||
|
+ vm = vm_api.get(name=name, namespace=namespace)
|
||||||
|
+ except ApiException as e:
|
||||||
|
+ logging.error("VM %s doesn't exist", name)
|
||||||
|
+ fail(EC_FETCH_VM_UUID)
|
||||||
|
return "off"
|
||||||
|
logging.error("Failed to get power status, with API Exception: %s", e)
|
||||||
|
fail(EC_STATUS)
|
||||||
|
@@ -49,38 +53,53 @@
|
||||||
|
logging.error("Failed to get power status, with Exception: %s", e)
|
||||||
|
fail(EC_STATUS)
|
||||||
|
|
||||||
|
+def translate_status(instance_status):
|
||||||
|
+ if instance_status == "Running":
|
||||||
|
+ return "on"
|
||||||
|
+ return "unknown"
|
||||||
|
+
|
||||||
|
def set_power_status(conn, options):
|
||||||
|
logging.debug("Starting set status operation")
|
||||||
|
try:
|
||||||
|
+ apiversion= options.get("--apiversion")
|
||||||
|
namespace = options.get("--namespace")
|
||||||
|
name = options.get("--plug")
|
||||||
|
action = 'start' if options["--action"] == "on" else 'stop'
|
||||||
|
- virtctl_vm_action(conn, action, namespace, name)
|
||||||
|
+ virtctl_vm_action(conn, action, namespace, name, apiversion)
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("Failed to set power status, with Exception: %s", e)
|
||||||
|
fail(EC_STATUS)
|
||||||
|
|
||||||
|
def define_new_opts():
|
||||||
|
- all_opt["namespace"] = {
|
||||||
|
- "getopt" : ":",
|
||||||
|
- "longopt" : "namespace",
|
||||||
|
- "help" : "--namespace=[namespace] Namespace of the KubeVirt machine",
|
||||||
|
- "shortdesc" : "Namespace of the KubeVirt machine.",
|
||||||
|
- "required" : "1",
|
||||||
|
- "order" : 2
|
||||||
|
- }
|
||||||
|
- all_opt["kubeconfig"] = {
|
||||||
|
- "getopt" : ":",
|
||||||
|
- "longopt" : "kubeconfig",
|
||||||
|
- "help" : "--kubeconfig=[kubeconfig] Kubeconfig file path",
|
||||||
|
- "shortdesc": "Kubeconfig file path",
|
||||||
|
- "required": "0",
|
||||||
|
- "order": 4
|
||||||
|
- }
|
||||||
|
+ all_opt["namespace"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "namespace",
|
||||||
|
+ "help" : "--namespace=[namespace] Namespace of the KubeVirt machine",
|
||||||
|
+ "shortdesc" : "Namespace of the KubeVirt machine.",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "order" : 2
|
||||||
|
+ }
|
||||||
|
+ all_opt["kubeconfig"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "kubeconfig",
|
||||||
|
+ "help" : "--kubeconfig=[kubeconfig] Kubeconfig file path",
|
||||||
|
+ "shortdesc": "Kubeconfig file path",
|
||||||
|
+ "required": "0",
|
||||||
|
+ "order": 4
|
||||||
|
+ }
|
||||||
|
+ all_opt["apiversion"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "apiversion",
|
||||||
|
+ "help" : "--apiversion=[apiversion] Version of the KubeVirt API",
|
||||||
|
+ "shortdesc" : "Version of the KubeVirt API.",
|
||||||
|
+ "required" : "0",
|
||||||
|
+ "default" : "kubevirt.io/v1",
|
||||||
|
+ "order" : 5
|
||||||
|
+ }
|
||||||
|
|
||||||
|
-def virtctl_vm_action(conn, action, namespace, name):
|
||||||
|
+def virtctl_vm_action(conn, action, namespace, name, apiversion):
|
||||||
|
path = '/apis/subresources.{api_version}/namespaces/{namespace}/virtualmachines/{name}/{action}'
|
||||||
|
- path = path.format(api_version=API_VERSION, namespace=namespace, name=name, action=action)
|
||||||
|
+ path = path.format(api_version=apiversion, namespace=namespace, name=name, action=action)
|
||||||
|
return conn.request('put', path, header_params={'accept': '*/*'})
|
||||||
|
|
||||||
|
def validate_options(required_options_list, options):
|
||||||
|
@@ -92,8 +111,13 @@
|
||||||
|
def main():
|
||||||
|
conn = None
|
||||||
|
|
||||||
|
- device_opt = ["port", "namespace", "kubeconfig", "separator", "no_password"]
|
||||||
|
+ device_opt = ["port", "namespace", "kubeconfig", "ssl_insecure", "no_password", "apiversion"]
|
||||||
|
+
|
||||||
|
+ atexit.register(atexit_handler)
|
||||||
|
define_new_opts()
|
||||||
|
+
|
||||||
|
+ all_opt["power_timeout"]["default"] = "40"
|
||||||
|
+
|
||||||
|
options = check_input(device_opt, process_input(device_opt))
|
||||||
|
|
||||||
|
docs = {}
|
||||||
|
@@ -106,6 +130,11 @@
|
||||||
|
|
||||||
|
validate_options(['--namespace'], options)
|
||||||
|
|
||||||
|
+ # Disable insecure-certificate-warning message
|
||||||
|
+ if "--ssl-insecure" in options:
|
||||||
|
+ import urllib3
|
||||||
|
+ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||||
|
+
|
||||||
|
try:
|
||||||
|
from kubernetes import config
|
||||||
|
from openshift.dynamic import DynamicClient
|
@ -0,0 +1,102 @@
|
|||||||
|
From 647841dea9d93922779a4aa7d0b5f52f5bc2b4e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Kenigsberg <danken@redhat.com>
|
||||||
|
Date: Thu, 13 Jan 2022 14:57:26 +0200
|
||||||
|
Subject: [PATCH] fence_kubevirt: take default namespace from context
|
||||||
|
|
||||||
|
If --namespace is not provided to kubectl, a default one is taken from
|
||||||
|
kubeconfig context. Let fence_kubevirt behave similarly.
|
||||||
|
|
||||||
|
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
|
||||||
|
---
|
||||||
|
agents/kubevirt/fence_kubevirt.py | 24 +++++++++++++-----------
|
||||||
|
tests/data/metadata/fence_kubevirt.xml | 2 +-
|
||||||
|
2 files changed, 14 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/kubevirt/fence_kubevirt.py b/agents/kubevirt/fence_kubevirt.py
|
||||||
|
index 8392b75a0..8c27a0334 100755
|
||||||
|
--- a/agents/kubevirt/fence_kubevirt.py
|
||||||
|
+++ b/agents/kubevirt/fence_kubevirt.py
|
||||||
|
@@ -12,12 +12,21 @@
|
||||||
|
except ImportError:
|
||||||
|
logging.error("Couldn\'t import kubernetes.client.exceptions.ApiException - not found or not accessible")
|
||||||
|
|
||||||
|
+def _get_namespace(options):
|
||||||
|
+ from kubernetes import config
|
||||||
|
+
|
||||||
|
+ ns = options.get("--namespace")
|
||||||
|
+ if ns is None:
|
||||||
|
+ ns = config.kube_config.list_kube_config_contexts()[1]['context']['namespace']
|
||||||
|
+
|
||||||
|
+ return ns
|
||||||
|
+
|
||||||
|
def get_nodes_list(conn, options):
|
||||||
|
logging.debug("Starting list/monitor operation")
|
||||||
|
result = {}
|
||||||
|
try:
|
||||||
|
apiversion = options.get("--apiversion")
|
||||||
|
- namespace = options.get("--namespace")
|
||||||
|
+ namespace = _get_namespace(options)
|
||||||
|
include_uninitialized = True
|
||||||
|
vm_api = conn.resources.get(api_version=apiversion, kind='VirtualMachine')
|
||||||
|
vm_list = vm_api.get(namespace=namespace)
|
||||||
|
@@ -31,7 +40,7 @@ def get_power_status(conn, options):
|
||||||
|
logging.debug("Starting get status operation")
|
||||||
|
try:
|
||||||
|
apiversion = options.get("--apiversion")
|
||||||
|
- namespace = options.get("--namespace")
|
||||||
|
+ namespace = _get_namespace(options)
|
||||||
|
name = options.get("--plug")
|
||||||
|
vmi_api = conn.resources.get(api_version=apiversion,
|
||||||
|
kind='VirtualMachineInstance')
|
||||||
|
@@ -61,7 +70,7 @@ def set_power_status(conn, options):
|
||||||
|
logging.debug("Starting set status operation")
|
||||||
|
try:
|
||||||
|
apiversion= options.get("--apiversion")
|
||||||
|
- namespace = options.get("--namespace")
|
||||||
|
+ namespace = _get_namespace(options)
|
||||||
|
name = options.get("--plug")
|
||||||
|
action = 'start' if options["--action"] == "on" else 'stop'
|
||||||
|
virtctl_vm_action(conn, action, namespace, name, apiversion)
|
||||||
|
@@ -75,7 +84,7 @@ def define_new_opts():
|
||||||
|
"longopt" : "namespace",
|
||||||
|
"help" : "--namespace=[namespace] Namespace of the KubeVirt machine",
|
||||||
|
"shortdesc" : "Namespace of the KubeVirt machine.",
|
||||||
|
- "required" : "1",
|
||||||
|
+ "required" : "0",
|
||||||
|
"order" : 2
|
||||||
|
}
|
||||||
|
all_opt["kubeconfig"] = {
|
||||||
|
@@ -101,11 +110,6 @@ def virtctl_vm_action(conn, action, namespace, name, apiversion):
|
||||||
|
path = path.format(api_version=apiversion, namespace=namespace, name=name, action=action)
|
||||||
|
return conn.request('put', path, header_params={'accept': '*/*'})
|
||||||
|
|
||||||
|
-def validate_options(required_options_list, options):
|
||||||
|
- for required_option in required_options_list:
|
||||||
|
- if required_option not in options:
|
||||||
|
- fail_usage("Failed: %s option must be provided" % required_option)
|
||||||
|
-
|
||||||
|
# Main agent method
|
||||||
|
def main():
|
||||||
|
conn = None
|
||||||
|
@@ -127,8 +131,6 @@ def main():
|
||||||
|
|
||||||
|
run_delay(options)
|
||||||
|
|
||||||
|
- validate_options(['--namespace'], options)
|
||||||
|
-
|
||||||
|
# Disable insecure-certificate-warning message
|
||||||
|
if "--ssl-insecure" in options:
|
||||||
|
import urllib3
|
||||||
|
diff --git a/tests/data/metadata/fence_kubevirt.xml b/tests/data/metadata/fence_kubevirt.xml
|
||||||
|
index 24e975587..ccb20c224 100644
|
||||||
|
--- a/tests/data/metadata/fence_kubevirt.xml
|
||||||
|
+++ b/tests/data/metadata/fence_kubevirt.xml
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
<content type="boolean" />
|
||||||
|
<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="namespace" unique="0" required="1">
|
||||||
|
+ <parameter name="namespace" unique="0" required="0">
|
||||||
|
<getopt mixed="--namespace=[namespace]" />
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Namespace of the KubeVirt machine.</shortdesc>
|
@ -0,0 +1,22 @@
|
|||||||
|
From 06855a8227fa91f6216119daa3d32d5858c62837 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Mon, 27 Sep 2021 12:05:41 +0200
|
||||||
|
Subject: [PATCH] fence_amt_ws: fix "or" causing dead code
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/amt_ws/fence_amt_ws.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py
|
||||||
|
index 23c8a61a4..122cec309 100755
|
||||||
|
--- a/agents/amt_ws/fence_amt_ws.py
|
||||||
|
+++ b/agents/amt_ws/fence_amt_ws.py
|
||||||
|
@@ -148,7 +148,7 @@ def set_boot_order(_, client, options):
|
||||||
|
|
||||||
|
if options["--boot-option"] == "pxe":
|
||||||
|
device = "Intel(r) AMT: Force PXE Boot"
|
||||||
|
- elif options["--boot-option"] == "hd" or "hdsafe":
|
||||||
|
+ elif options["--boot-option"] in ["hd", "hdsafe"]:
|
||||||
|
device = "Intel(r) AMT: Force Hard-drive Boot"
|
||||||
|
elif options["--boot-option"] == "cd":
|
||||||
|
device = "Intel(r) AMT: Force CD/DVD Boot"
|
32
SOURCES/bz2010709-2-fence_amt_ws-boot-option.patch
Normal file
32
SOURCES/bz2010709-2-fence_amt_ws-boot-option.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 9812473270e9a404c632358c1debfa4a1fb440fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Wed, 20 Oct 2021 15:46:42 +0200
|
||||||
|
Subject: [PATCH] fence_amt_ws: fix --boot-option (choices are uppercased while
|
||||||
|
getting parsed)
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/amt_ws/fence_amt_ws.py | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/amt_ws/fence_amt_ws.py b/agents/amt_ws/fence_amt_ws.py
|
||||||
|
index 122cec309..5e7452a97 100755
|
||||||
|
--- a/agents/amt_ws/fence_amt_ws.py
|
||||||
|
+++ b/agents/amt_ws/fence_amt_ws.py
|
||||||
|
@@ -146,13 +146,13 @@ def set_boot_order(_, client, options):
|
||||||
|
wsman = 'http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd'
|
||||||
|
namespace = CIM_BootConfigSetting
|
||||||
|
|
||||||
|
- if options["--boot-option"] == "pxe":
|
||||||
|
+ if options["--boot-option"] == "PXE":
|
||||||
|
device = "Intel(r) AMT: Force PXE Boot"
|
||||||
|
- elif options["--boot-option"] in ["hd", "hdsafe"]:
|
||||||
|
+ elif options["--boot-option"] in ["HD", "HDSAFE"]:
|
||||||
|
device = "Intel(r) AMT: Force Hard-drive Boot"
|
||||||
|
- elif options["--boot-option"] == "cd":
|
||||||
|
+ elif options["--boot-option"] == "CD":
|
||||||
|
device = "Intel(r) AMT: Force CD/DVD Boot"
|
||||||
|
- elif options["--boot-option"] == "diag":
|
||||||
|
+ elif options["--boot-option"] == "DIAG":
|
||||||
|
device = "Intel(r) AMT: Force Diagnostic Boot"
|
||||||
|
else:
|
||||||
|
logging.error('Boot device: %s not supported.', \
|
98
SOURCES/bz2022334-fence_zvmip-add-disable-ssl.patch
Normal file
98
SOURCES/bz2022334-fence_zvmip-add-disable-ssl.patch
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
From 90c4f78e005ca4141039d1dce032b5f2c2ff4783 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Thu, 10 Feb 2022 12:22:58 +0100
|
||||||
|
Subject: [PATCH 1/2] fencing: add ability to set bool parameters to 0 or false
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/fencing.py.py | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/fencing.py.py b/lib/fencing.py.py
|
||||||
|
index 55e38c407..696388d55 100644
|
||||||
|
--- a/lib/fencing.py.py
|
||||||
|
+++ b/lib/fencing.py.py
|
||||||
|
@@ -1502,6 +1502,8 @@ def _parse_input_stdin(avail_opt):
|
||||||
|
opt["--"+all_opt[name]["longopt"].rstrip(":")] = value
|
||||||
|
elif value.lower() in ["1", "yes", "on", "true"]:
|
||||||
|
opt["--"+all_opt[name]["longopt"]] = "1"
|
||||||
|
+ elif value.lower() in ["0", "no", "off", "false"]:
|
||||||
|
+ opt["--"+all_opt[name]["longopt"]] = "0"
|
||||||
|
else:
|
||||||
|
logging.warning("Parse error: Ignoring option '%s' because it does not have value\n", name)
|
||||||
|
|
||||||
|
|
||||||
|
From 249abc8e5620fb1a3d97a0af6db34b1f2cbf3ae5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Thu, 10 Feb 2022 12:27:02 +0100
|
||||||
|
Subject: [PATCH 2/2] fence_zvmip: add --disable-ssl
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/zvm/fence_zvmip.py | 18 +++++++++++++++++-
|
||||||
|
tests/data/metadata/fence_zvmip.xml | 7 ++++++-
|
||||||
|
2 files changed, 23 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
|
||||||
|
index 96021b13e..e8f849eda 100644
|
||||||
|
--- a/agents/zvm/fence_zvmip.py
|
||||||
|
+++ b/agents/zvm/fence_zvmip.py
|
||||||
|
@@ -156,11 +156,24 @@ def get_list_of_images(options, command, data_as_plug):
|
||||||
|
conn.close()
|
||||||
|
return (return_code, reason_code, images)
|
||||||
|
|
||||||
|
+def define_new_opts():
|
||||||
|
+ all_opt["disable_ssl"] = {
|
||||||
|
+ "getopt" : "",
|
||||||
|
+ "longopt" : "disable-ssl",
|
||||||
|
+ "help" : "--disable-ssl Don't use SSL connection",
|
||||||
|
+ "required" : "0",
|
||||||
|
+ "shortdesc" : "Don't use SSL",
|
||||||
|
+ "order": 2
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
def main():
|
||||||
|
device_opt = ["ipaddr", "login", "passwd", "port", "method", "missing_as_off",
|
||||||
|
- "inet4_only", "inet6_only", "ssl"]
|
||||||
|
+ "inet4_only", "inet6_only", "ssl", "disable_ssl"]
|
||||||
|
|
||||||
|
atexit.register(atexit_handler)
|
||||||
|
+ define_new_opts()
|
||||||
|
+
|
||||||
|
+ all_opt["ssl"]["help"] = "-z, --ssl Use SSL connection with verifying certificate (Default)"
|
||||||
|
|
||||||
|
all_opt["ipport"]["default"] = "44444"
|
||||||
|
all_opt["shell_timeout"]["default"] = "5"
|
||||||
|
@@ -168,6 +181,9 @@ def main():
|
||||||
|
all_opt["ssl"]["default"] = "1"
|
||||||
|
options = check_input(device_opt, process_input(device_opt), other_conditions=True)
|
||||||
|
|
||||||
|
+ if "--disable-ssl" in options or options["--ssl"] == "0":
|
||||||
|
+ del options["--ssl"]
|
||||||
|
+
|
||||||
|
if len(options.get("--plug", "")) > 8:
|
||||||
|
fail_usage("Failed: Name of image can not be longer than 8 characters")
|
||||||
|
|
||||||
|
diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
index f32fc159d..0b7ba4785 100644
|
||||||
|
--- a/tests/data/metadata/fence_zvmip.xml
|
||||||
|
+++ b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
@@ -94,7 +94,7 @@ to access the system's directory manager.
|
||||||
|
<parameter name="ssl" unique="0" required="0">
|
||||||
|
<getopt mixed="-z, --ssl" />
|
||||||
|
<content type="boolean" default="1" />
|
||||||
|
- <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
||||||
|
+ <shortdesc lang="en">Use SSL connection with verifying certificate (Default)</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
<parameter name="ssl_insecure" unique="0" required="0">
|
||||||
|
<getopt mixed="--ssl-insecure" />
|
||||||
|
@@ -111,6 +111,11 @@ to access the system's directory manager.
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Login name</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
+ <parameter name="disable_ssl" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--disable-ssl" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Don't use SSL</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
<parameter name="quiet" unique="0" required="0">
|
||||||
|
<getopt mixed="-q, --quiet" />
|
||||||
|
<content type="boolean" />
|
136
SOURCES/bz2022334-fence_zvmip-add-ssl-tls-support.patch
Normal file
136
SOURCES/bz2022334-fence_zvmip-add-ssl-tls-support.patch
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
From 81be3c529ec1165f3135b4f14fbec2a19403cfbe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Fri, 27 Aug 2021 08:53:36 +0200
|
||||||
|
Subject: [PATCH 1/2] fence_zvmip: add ssl/tls support
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/zvm/fence_zvmip.py | 20 ++++++++++++++++----
|
||||||
|
tests/data/metadata/fence_zvmip.xml | 19 +++++++++++++++++++
|
||||||
|
2 files changed, 35 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
|
||||||
|
index 001106a44..874eb699f 100644
|
||||||
|
--- a/agents/zvm/fence_zvmip.py
|
||||||
|
+++ b/agents/zvm/fence_zvmip.py
|
||||||
|
@@ -26,12 +26,22 @@ def open_socket(options):
|
||||||
|
except socket.gaierror:
|
||||||
|
fail(EC_LOGIN_DENIED)
|
||||||
|
|
||||||
|
- conn = socket.socket()
|
||||||
|
+ if "--ssl" in options:
|
||||||
|
+ import ssl
|
||||||
|
+ sock = socket.socket()
|
||||||
|
+ sslcx = ssl.create_default_context()
|
||||||
|
+ if "--ssl-insecure" in options:
|
||||||
|
+ sslcx.check_hostname = False
|
||||||
|
+ sslcx.verify_mode = ssl.CERT_NONE
|
||||||
|
+ conn = sslcx.wrap_socket(sock, server_hostname=options["--ip"])
|
||||||
|
+ else:
|
||||||
|
+ conn = socket.socket()
|
||||||
|
conn.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||||
|
conn.settimeout(float(options["--shell-timeout"]) or None)
|
||||||
|
try:
|
||||||
|
conn.connect(addr)
|
||||||
|
- except socket.error:
|
||||||
|
+ except socket.error as e:
|
||||||
|
+ logging.debug(e)
|
||||||
|
fail(EC_LOGIN_DENIED)
|
||||||
|
|
||||||
|
return conn
|
||||||
|
@@ -122,11 +132,12 @@ def get_list_of_images(options, command, data_as_plug):
|
||||||
|
images = set()
|
||||||
|
|
||||||
|
if output_len > 3*INT4:
|
||||||
|
+ recvflag = socket.MSG_WAITALL if "--ssl" not in options else 0
|
||||||
|
array_len = struct.unpack("!i", conn.recv(INT4))[0]
|
||||||
|
data = ""
|
||||||
|
|
||||||
|
while True:
|
||||||
|
- read_data = conn.recv(1024, socket.MSG_WAITALL).decode("UTF-8")
|
||||||
|
+ read_data = conn.recv(1024, recvflag).decode("UTF-8")
|
||||||
|
data += read_data
|
||||||
|
if array_len == len(data):
|
||||||
|
break
|
||||||
|
@@ -146,7 +157,8 @@ def get_list_of_images(options, command, data_as_plug):
|
||||||
|
return (return_code, reason_code, images)
|
||||||
|
|
||||||
|
def main():
|
||||||
|
- device_opt = ["ipaddr", "login", "passwd", "port", "method", "missing_as_off", "inet4_only", "inet6_only"]
|
||||||
|
+ device_opt = ["ipaddr", "login", "passwd", "port", "method", "missing_as_off",
|
||||||
|
+ "inet4_only", "inet6_only", "ssl"]
|
||||||
|
|
||||||
|
atexit.register(atexit_handler)
|
||||||
|
|
||||||
|
diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
index f84115c08..d91192946 100644
|
||||||
|
--- a/tests/data/metadata/fence_zvmip.xml
|
||||||
|
+++ b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
@@ -91,6 +91,21 @@ to access the system's directory manager.
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
+ <parameter name="ssl" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-z, --ssl" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="ssl_insecure" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--ssl-insecure" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="ssl_secure" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--ssl-secure" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
<parameter name="username" unique="0" required="1" obsoletes="login">
|
||||||
|
<getopt mixed="-l, --username=[name]" />
|
||||||
|
<content type="string" />
|
||||||
|
@@ -181,6 +196,10 @@ to access the system's directory manager.
|
||||||
|
<content type="integer" default="1" />
|
||||||
|
<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
+ <parameter name="gnutlscli_path" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--gnutlscli-path=[path]" />
|
||||||
|
+ <shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
</parameters>
|
||||||
|
<actions>
|
||||||
|
<action name="on" automatic="0"/>
|
||||||
|
|
||||||
|
From 8021e698095c5bd0ef33ee5f56fc448e946cb92c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Wed, 10 Nov 2021 16:31:24 +0100
|
||||||
|
Subject: [PATCH 2/2] fence_zvmip: use ssl by default
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/zvm/fence_zvmip.py | 1 +
|
||||||
|
tests/data/metadata/fence_zvmip.xml | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py
|
||||||
|
index 874eb699f..96021b13e 100644
|
||||||
|
--- a/agents/zvm/fence_zvmip.py
|
||||||
|
+++ b/agents/zvm/fence_zvmip.py
|
||||||
|
@@ -165,6 +165,7 @@ def main():
|
||||||
|
all_opt["ipport"]["default"] = "44444"
|
||||||
|
all_opt["shell_timeout"]["default"] = "5"
|
||||||
|
all_opt["missing_as_off"]["default"] = "1"
|
||||||
|
+ all_opt["ssl"]["default"] = "1"
|
||||||
|
options = check_input(device_opt, process_input(device_opt), other_conditions=True)
|
||||||
|
|
||||||
|
if len(options.get("--plug", "")) > 8:
|
||||||
|
diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
index d91192946..f32fc159d 100644
|
||||||
|
--- a/tests/data/metadata/fence_zvmip.xml
|
||||||
|
+++ b/tests/data/metadata/fence_zvmip.xml
|
||||||
|
@@ -93,7 +93,7 @@ to access the system's directory manager.
|
||||||
|
</parameter>
|
||||||
|
<parameter name="ssl" unique="0" required="0">
|
||||||
|
<getopt mixed="-z, --ssl" />
|
||||||
|
- <content type="boolean" />
|
||||||
|
+ <content type="boolean" default="1" />
|
||||||
|
<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
<parameter name="ssl_insecure" unique="0" required="0">
|
72
SOURCES/bz2029791-1-fence_openstack-add-ssl-insecure.patch
Normal file
72
SOURCES/bz2029791-1-fence_openstack-add-ssl-insecure.patch
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
From f79436d3a5e4cf279be0974e9633ad8994a017f7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Mon, 6 Dec 2021 12:59:31 +0100
|
||||||
|
Subject: [PATCH] fence_openstack: add --ssl-insecure
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/openstack/fence_openstack.py | 7 +++++--
|
||||||
|
tests/data/metadata/fence_openstack.xml | 5 +++++
|
||||||
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/openstack/fence_openstack.py b/agents/openstack/fence_openstack.py
|
||||||
|
index c480596c1..c2d9df160 100755
|
||||||
|
--- a/agents/openstack/fence_openstack.py
|
||||||
|
+++ b/agents/openstack/fence_openstack.py
|
||||||
|
@@ -89,7 +89,7 @@ def set_power_status(conn, options):
|
||||||
|
|
||||||
|
|
||||||
|
def nova_login(username, password, projectname, auth_url, user_domain_name,
|
||||||
|
- project_domain_name, cacert, apitimeout):
|
||||||
|
+ project_domain_name, ssl_insecure, cacert, apitimeout):
|
||||||
|
legacy_import = False
|
||||||
|
|
||||||
|
try:
|
||||||
|
@@ -127,7 +127,7 @@ def nova_login(username, password, projectname, auth_url, user_domain_name,
|
||||||
|
cacert=cacert,
|
||||||
|
)
|
||||||
|
|
||||||
|
- session = ksc_session.Session(auth=auth, verify=cacert, timeout=apitimeout)
|
||||||
|
+ session = ksc_session.Session(auth=auth, verify=False if ssl_insecure else cacert, timeout=apitimeout)
|
||||||
|
nova = client.Client("2", session=session, timeout=apitimeout)
|
||||||
|
apiversion = None
|
||||||
|
try:
|
||||||
|
@@ -220,6 +220,7 @@ def main():
|
||||||
|
"port",
|
||||||
|
"no_port",
|
||||||
|
"uuid",
|
||||||
|
+ "ssl_insecure",
|
||||||
|
"cacert",
|
||||||
|
"apitimeout",
|
||||||
|
]
|
||||||
|
@@ -268,6 +269,7 @@ def main():
|
||||||
|
fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
user_domain_name = options["--user-domain-name"]
|
||||||
|
project_domain_name = options["--project-domain-name"]
|
||||||
|
+ ssl_insecure = "--ssl-insecure" in options
|
||||||
|
cacert = options["--cacert"]
|
||||||
|
apitimeout = options["--apitimeout"]
|
||||||
|
try:
|
||||||
|
@@ -278,6 +280,7 @@ def main():
|
||||||
|
auth_url,
|
||||||
|
user_domain_name,
|
||||||
|
project_domain_name,
|
||||||
|
+ ssl_insecure,
|
||||||
|
cacert,
|
||||||
|
apitimeout,
|
||||||
|
)
|
||||||
|
diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
|
||||||
|
index 84503bbe0..926d18c3d 100644
|
||||||
|
--- a/tests/data/metadata/fence_openstack.xml
|
||||||
|
+++ b/tests/data/metadata/fence_openstack.xml
|
||||||
|
@@ -43,6 +43,11 @@
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">UUID of the node to be fenced.</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
+ <parameter name="ssl_insecure" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--ssl-insecure" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
<parameter name="username" unique="0" required="1" obsoletes="login">
|
||||||
|
<getopt mixed="-l, --username=[name]" />
|
||||||
|
<content type="string" />
|
59
SOURCES/bz2029791-2-fence_openstack-cacert-default.patch
Normal file
59
SOURCES/bz2029791-2-fence_openstack-cacert-default.patch
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
From b7032d16a07997ecab3b2c11a6436b3fa21f9043 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
|
||||||
|
Date: Thu, 6 Jan 2022 12:53:28 +0100
|
||||||
|
Subject: [PATCH] fence_openstack: relax ssl cacert default
|
||||||
|
|
||||||
|
allow the agent to use Base OS defaults vs forcing a specific file
|
||||||
|
to increase portability.
|
||||||
|
|
||||||
|
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
|
||||||
|
---
|
||||||
|
agents/openstack/fence_openstack.py | 12 +++++++++---
|
||||||
|
tests/data/metadata/fence_openstack.xml | 2 +-
|
||||||
|
2 files changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/openstack/fence_openstack.py b/agents/openstack/fence_openstack.py
|
||||||
|
index c2d9df160..36b353b52 100755
|
||||||
|
--- a/agents/openstack/fence_openstack.py
|
||||||
|
+++ b/agents/openstack/fence_openstack.py
|
||||||
|
@@ -127,7 +127,13 @@ def nova_login(username, password, projectname, auth_url, user_domain_name,
|
||||||
|
cacert=cacert,
|
||||||
|
)
|
||||||
|
|
||||||
|
- session = ksc_session.Session(auth=auth, verify=False if ssl_insecure else cacert, timeout=apitimeout)
|
||||||
|
+ caverify=True
|
||||||
|
+ if ssl_insecure:
|
||||||
|
+ caverify=False
|
||||||
|
+ elif cacert:
|
||||||
|
+ caverify=cacert
|
||||||
|
+
|
||||||
|
+ session = ksc_session.Session(auth=auth, verify=caverify, timeout=apitimeout)
|
||||||
|
nova = client.Client("2", session=session, timeout=apitimeout)
|
||||||
|
apiversion = None
|
||||||
|
try:
|
||||||
|
@@ -189,10 +195,10 @@ def define_new_opts():
|
||||||
|
all_opt["cacert"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
"longopt": "cacert",
|
||||||
|
- "help": "--cacert=[cacert] Path to the PEM file with trusted authority certificates",
|
||||||
|
+ "help": "--cacert=[cacert] Path to the PEM file with trusted authority certificates (override global CA trust)",
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "SSL X.509 certificates file",
|
||||||
|
- "default": "/etc/pki/tls/certs/ca-bundle.crt",
|
||||||
|
+ "default": "",
|
||||||
|
"order": 7,
|
||||||
|
}
|
||||||
|
all_opt["apitimeout"] = {
|
||||||
|
diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
|
||||||
|
index 926d18c3d..c8dc2e60f 100644
|
||||||
|
--- a/tests/data/metadata/fence_openstack.xml
|
||||||
|
+++ b/tests/data/metadata/fence_openstack.xml
|
||||||
|
@@ -100,7 +100,7 @@
|
||||||
|
</parameter>
|
||||||
|
<parameter name="cacert" unique="0" required="0">
|
||||||
|
<getopt mixed="--cacert=[cacert]" />
|
||||||
|
- <content type="string" default="/etc/pki/tls/certs/ca-bundle.crt" />
|
||||||
|
+ <content type="string" default="" />
|
||||||
|
<shortdesc lang="en">SSL X.509 certificates file</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
<parameter name="apitimeout" unique="0" required="0">
|
@ -0,0 +1,313 @@
|
|||||||
|
From 2f741df2ce73da85bbd205d861b527aa141d9776 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Fri, 14 Jan 2022 14:47:41 +0100
|
||||||
|
Subject: [PATCH 1/2] fencing: add source_env()
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/fencing.py.py | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/fencing.py.py b/lib/fencing.py.py
|
||||||
|
index d85b23568..55e38c407 100644
|
||||||
|
--- a/lib/fencing.py.py
|
||||||
|
+++ b/lib/fencing.py.py
|
||||||
|
@@ -1143,6 +1143,14 @@ def fence_logout(conn, logout_string, sleep=0):
|
||||||
|
except pexpect.ExceptionPexpect:
|
||||||
|
pass
|
||||||
|
|
||||||
|
+def source_env(env_file):
|
||||||
|
+ # POSIX: name shall not contain '=', value doesn't contain '\0'
|
||||||
|
+ output = subprocess.check_output("source {} && env -0".format(env_file), shell=True,
|
||||||
|
+ executable="/bin/sh")
|
||||||
|
+ # replace env
|
||||||
|
+ os.environ.clear()
|
||||||
|
+ os.environ.update(line.partition('=')[::2] for line in output.decode("utf-8").split('\0'))
|
||||||
|
+
|
||||||
|
# Convert array of format [[key1, value1], [key2, value2], ... [keyN, valueN]] to dict, where key is
|
||||||
|
# in format a.b.c.d...z and returned dict has key only z
|
||||||
|
def array_to_dict(array):
|
||||||
|
|
||||||
|
From fe2183a97e0a5734702e9cba8da21f01afd8f577 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Fri, 14 Jan 2022 14:54:10 +0100
|
||||||
|
Subject: [PATCH 2/2] fence_openstack: add support for reading config from
|
||||||
|
clouds.yaml and openrc
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/openstack/fence_openstack.py | 116 ++++++++++++++++++++----
|
||||||
|
tests/data/metadata/fence_openstack.xml | 32 +++++--
|
||||||
|
2 files changed, 126 insertions(+), 22 deletions(-)
|
||||||
|
mode change 100755 => 100644 agents/openstack/fence_openstack.py
|
||||||
|
|
||||||
|
diff --git a/agents/openstack/fence_openstack.py b/agents/openstack/fence_openstack.py
|
||||||
|
old mode 100755
|
||||||
|
new mode 100644
|
||||||
|
index 36b353b52..d3a4be3aa
|
||||||
|
--- a/agents/openstack/fence_openstack.py
|
||||||
|
+++ b/agents/openstack/fence_openstack.py
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
|
||||||
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
from fencing import *
|
||||||
|
-from fencing import fail_usage, run_delay
|
||||||
|
+from fencing import fail_usage, run_delay, source_env
|
||||||
|
|
||||||
|
try:
|
||||||
|
from novaclient import client
|
||||||
|
@@ -26,6 +26,23 @@ def translate_status(instance_status):
|
||||||
|
return "off"
|
||||||
|
return "unknown"
|
||||||
|
|
||||||
|
+def get_cloud(options):
|
||||||
|
+ import os, yaml
|
||||||
|
+
|
||||||
|
+ clouds_yaml = os.path.expanduser("~/.config/openstack/clouds.yaml")
|
||||||
|
+ if os.path.exists(clouds_yaml):
|
||||||
|
+ with open(clouds_yaml, "r") as yaml_stream:
|
||||||
|
+ try:
|
||||||
|
+ clouds = yaml.safe_load(yaml_stream)
|
||||||
|
+ except yaml.YAMLError as exc:
|
||||||
|
+ fail_usage("Failed: Unable to read: " + clouds_yaml)
|
||||||
|
+
|
||||||
|
+ cloud = clouds.get("clouds").get(options["--cloud"])
|
||||||
|
+ if not cloud:
|
||||||
|
+ fail_usage("Cloud: {} not found.".format(options["--cloud"]))
|
||||||
|
+
|
||||||
|
+ return cloud
|
||||||
|
+
|
||||||
|
|
||||||
|
def get_nodes_list(conn, options):
|
||||||
|
logging.info("Running %s action", options["--action"])
|
||||||
|
@@ -153,7 +170,7 @@ def define_new_opts():
|
||||||
|
"getopt": ":",
|
||||||
|
"longopt": "auth-url",
|
||||||
|
"help": "--auth-url=[authurl] Keystone Auth URL",
|
||||||
|
- "required": "1",
|
||||||
|
+ "required": "0",
|
||||||
|
"shortdesc": "Keystone Auth URL",
|
||||||
|
"order": 2,
|
||||||
|
}
|
||||||
|
@@ -161,7 +178,7 @@ def define_new_opts():
|
||||||
|
"getopt": ":",
|
||||||
|
"longopt": "project-name",
|
||||||
|
"help": "--project-name=[project] Tenant Or Project Name",
|
||||||
|
- "required": "1",
|
||||||
|
+ "required": "0",
|
||||||
|
"shortdesc": "Keystone Project",
|
||||||
|
"default": "admin",
|
||||||
|
"order": 3,
|
||||||
|
@@ -184,13 +201,38 @@ def define_new_opts():
|
||||||
|
"default": "Default",
|
||||||
|
"order": 5,
|
||||||
|
}
|
||||||
|
+ all_opt["clouds-yaml"] = {
|
||||||
|
+ "getopt": ":",
|
||||||
|
+ "longopt": "clouds-yaml",
|
||||||
|
+ "help": "--clouds-yaml=[clouds-yaml] Path to the clouds.yaml config file",
|
||||||
|
+ "required": "0",
|
||||||
|
+ "shortdesc": "clouds.yaml config file",
|
||||||
|
+ "default": "~/.config/openstack/clouds.yaml",
|
||||||
|
+ "order": 6,
|
||||||
|
+ }
|
||||||
|
+ all_opt["cloud"] = {
|
||||||
|
+ "getopt": ":",
|
||||||
|
+ "longopt": "cloud",
|
||||||
|
+ "help": "--cloud=[cloud] Openstack cloud (from clouds.yaml).",
|
||||||
|
+ "required": "0",
|
||||||
|
+ "shortdesc": "Cloud from clouds.yaml",
|
||||||
|
+ "order": 7,
|
||||||
|
+ }
|
||||||
|
+ all_opt["openrc"] = {
|
||||||
|
+ "getopt": ":",
|
||||||
|
+ "longopt": "openrc",
|
||||||
|
+ "help": "--openrc=[openrc] Path to the openrc config file",
|
||||||
|
+ "required": "0",
|
||||||
|
+ "shortdesc": "openrc config file",
|
||||||
|
+ "order": 8,
|
||||||
|
+ }
|
||||||
|
all_opt["uuid"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
"longopt": "uuid",
|
||||||
|
"help": "--uuid=[uuid] Replaced by -n, --plug",
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "Replaced by port/-n/--plug",
|
||||||
|
- "order": 6,
|
||||||
|
+ "order": 9,
|
||||||
|
}
|
||||||
|
all_opt["cacert"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -199,7 +241,7 @@ def define_new_opts():
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "SSL X.509 certificates file",
|
||||||
|
"default": "",
|
||||||
|
- "order": 7,
|
||||||
|
+ "order": 10,
|
||||||
|
}
|
||||||
|
all_opt["apitimeout"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -209,7 +251,7 @@ def define_new_opts():
|
||||||
|
"shortdesc": "Timeout in seconds to use for API calls, default is 60.",
|
||||||
|
"required": "0",
|
||||||
|
"default": 60,
|
||||||
|
- "order": 8,
|
||||||
|
+ "order": 11,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -218,11 +260,16 @@ def main():
|
||||||
|
|
||||||
|
device_opt = [
|
||||||
|
"login",
|
||||||
|
+ "no_login",
|
||||||
|
"passwd",
|
||||||
|
+ "no_password",
|
||||||
|
"auth-url",
|
||||||
|
"project-name",
|
||||||
|
"user-domain-name",
|
||||||
|
"project-domain-name",
|
||||||
|
+ "clouds-yaml",
|
||||||
|
+ "cloud",
|
||||||
|
+ "openrc",
|
||||||
|
"port",
|
||||||
|
"no_port",
|
||||||
|
"uuid",
|
||||||
|
@@ -265,19 +312,56 @@ def main():
|
||||||
|
|
||||||
|
run_delay(options)
|
||||||
|
|
||||||
|
- username = options["--username"]
|
||||||
|
- password = options["--password"]
|
||||||
|
- projectname = options["--project-name"]
|
||||||
|
- auth_url = None
|
||||||
|
- try:
|
||||||
|
- auth_url = options["--auth-url"]
|
||||||
|
- except KeyError:
|
||||||
|
- fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
- user_domain_name = options["--user-domain-name"]
|
||||||
|
- project_domain_name = options["--project-domain-name"]
|
||||||
|
+ if options.get("--clouds-yaml"):
|
||||||
|
+ if not os.path.exists(os.path.expanduser(options["--clouds-yaml"])):
|
||||||
|
+ fail_usage("Failed: {} does not exist".format(options.get("--clouds-yaml")))
|
||||||
|
+ if not options.get("--cloud"):
|
||||||
|
+ fail_usage("Failed: \"cloud\" not specified")
|
||||||
|
+ cloud = get_cloud(options)
|
||||||
|
+ username = cloud.get("username")
|
||||||
|
+ password = cloud.get("password")
|
||||||
|
+ projectname = cloud.get("project_name")
|
||||||
|
+ auth_url = None
|
||||||
|
+ try:
|
||||||
|
+ auth_url = cloud.get("auth_url")
|
||||||
|
+ except KeyError:
|
||||||
|
+ fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
+ user_domain_name = cloud.get("user_domain_name")
|
||||||
|
+ project_domain_name = cloud.get("project_domain_name")
|
||||||
|
+ caverify = cloud.get("verify")
|
||||||
|
+ if caverify in [True, False]:
|
||||||
|
+ options["--ssl-insecure"] = caverify
|
||||||
|
+ else:
|
||||||
|
+ options["--cacert"] = caverify
|
||||||
|
+ if options.get("--openrc") and os.path.exists(os.path.expanduser(options["--openrc"])):
|
||||||
|
+ source_env(options["--openrc"])
|
||||||
|
+ env = os.environ
|
||||||
|
+ username = env.get("OS_USERNAME")
|
||||||
|
+ password = env.get("OS_PASSWORD")
|
||||||
|
+ projectname = env.get("OS_PROJECT_NAME")
|
||||||
|
+ auth_url = None
|
||||||
|
+ try:
|
||||||
|
+ auth_url = env["OS_AUTH_URL"]
|
||||||
|
+ except KeyError:
|
||||||
|
+ fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
+ user_domain_name = env.get("OS_USER_DOMAIN_NAME")
|
||||||
|
+ project_domain_name = env.get("OS_PROJECT_DOMAIN_NAME")
|
||||||
|
+ else:
|
||||||
|
+ username = options["--username"]
|
||||||
|
+ password = options["--password"]
|
||||||
|
+ projectname = options["--project-name"]
|
||||||
|
+ auth_url = None
|
||||||
|
+ try:
|
||||||
|
+ auth_url = options["--auth-url"]
|
||||||
|
+ except KeyError:
|
||||||
|
+ fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
+ user_domain_name = options["--user-domain-name"]
|
||||||
|
+ project_domain_name = options["--project-domain-name"]
|
||||||
|
+
|
||||||
|
ssl_insecure = "--ssl-insecure" in options
|
||||||
|
cacert = options["--cacert"]
|
||||||
|
apitimeout = options["--apitimeout"]
|
||||||
|
+
|
||||||
|
try:
|
||||||
|
conn = nova_login(
|
||||||
|
username,
|
||||||
|
diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
|
||||||
|
index c8dc2e60f..55a57b4d7 100644
|
||||||
|
--- a/tests/data/metadata/fence_openstack.xml
|
||||||
|
+++ b/tests/data/metadata/fence_openstack.xml
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
<content type="string" default="reboot" />
|
||||||
|
<shortdesc lang="en">Fencing action</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="login" unique="0" required="1" deprecated="1">
|
||||||
|
+ <parameter name="login" unique="0" required="0" deprecated="1">
|
||||||
|
<getopt mixed="-l, --username=[name]" />
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Login name</shortdesc>
|
||||||
|
@@ -48,27 +48,27 @@
|
||||||
|
<content type="boolean" />
|
||||||
|
<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="username" unique="0" required="1" obsoletes="login">
|
||||||
|
+ <parameter name="username" unique="0" required="0" obsoletes="login">
|
||||||
|
<getopt mixed="-l, --username=[name]" />
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Login name</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="auth-url" unique="0" required="1" deprecated="1">
|
||||||
|
+ <parameter name="auth-url" unique="0" required="0" deprecated="1">
|
||||||
|
<getopt mixed="--auth-url=[authurl]" />
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Keystone Auth URL</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="auth_url" unique="0" required="1" obsoletes="auth-url">
|
||||||
|
+ <parameter name="auth_url" unique="0" required="0" obsoletes="auth-url">
|
||||||
|
<getopt mixed="--auth-url=[authurl]" />
|
||||||
|
<content type="string" />
|
||||||
|
<shortdesc lang="en">Keystone Auth URL</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="project-name" unique="0" required="1" deprecated="1">
|
||||||
|
+ <parameter name="project-name" unique="0" required="0" deprecated="1">
|
||||||
|
<getopt mixed="--project-name=[project]" />
|
||||||
|
<content type="string" default="admin" />
|
||||||
|
<shortdesc lang="en">Keystone Project</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="project_name" unique="0" required="1" obsoletes="project-name">
|
||||||
|
+ <parameter name="project_name" unique="0" required="0" obsoletes="project-name">
|
||||||
|
<getopt mixed="--project-name=[project]" />
|
||||||
|
<content type="string" default="admin" />
|
||||||
|
<shortdesc lang="en">Keystone Project</shortdesc>
|
||||||
|
@@ -93,6 +93,26 @@
|
||||||
|
<content type="string" default="Default" />
|
||||||
|
<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
+ <parameter name="clouds-yaml" unique="0" required="0" deprecated="1">
|
||||||
|
+ <getopt mixed="--clouds-yaml=[clouds-yaml]" />
|
||||||
|
+ <content type="string" default="~/.config/openstack/clouds.yaml" />
|
||||||
|
+ <shortdesc lang="en">clouds.yaml config file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="clouds_yaml" unique="0" required="0" obsoletes="clouds-yaml">
|
||||||
|
+ <getopt mixed="--clouds-yaml=[clouds-yaml]" />
|
||||||
|
+ <content type="string" default="~/.config/openstack/clouds.yaml" />
|
||||||
|
+ <shortdesc lang="en">clouds.yaml config file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="cloud" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--cloud=[cloud]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Cloud from clouds.yaml</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="openrc" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--openrc=[openrc]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">openrc config file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
<parameter name="uuid" unique="0" required="0">
|
||||||
|
<getopt mixed="--uuid=[uuid]" />
|
||||||
|
<content type="string" />
|
@ -0,0 +1,171 @@
|
|||||||
|
From 7d9572ec947d23fa18ac530f07fe33ba148c9634 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Mon, 17 Jan 2022 14:32:53 +0100
|
||||||
|
Subject: [PATCH] fence_openstack: fix issues with new clouds.yaml/openrc
|
||||||
|
parameters - hardcoded clouds.yaml paths to work like the openstack cli
|
||||||
|
client (used by the resource agents)
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/openstack/fence_openstack.py | 55 +++++++++++--------------
|
||||||
|
tests/data/metadata/fence_openstack.xml | 10 -----
|
||||||
|
2 files changed, 25 insertions(+), 40 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agents/openstack/fence_openstack.py b/agents/openstack/fence_openstack.py
|
||||||
|
index d3a4be3aa..666016d78 100644
|
||||||
|
--- a/agents/openstack/fence_openstack.py
|
||||||
|
+++ b/agents/openstack/fence_openstack.py
|
||||||
|
@@ -3,6 +3,7 @@
|
||||||
|
import atexit
|
||||||
|
import logging
|
||||||
|
import sys
|
||||||
|
+import os
|
||||||
|
|
||||||
|
import urllib3
|
||||||
|
|
||||||
|
@@ -27,9 +28,15 @@ def translate_status(instance_status):
|
||||||
|
return "unknown"
|
||||||
|
|
||||||
|
def get_cloud(options):
|
||||||
|
- import os, yaml
|
||||||
|
+ import yaml
|
||||||
|
|
||||||
|
- clouds_yaml = os.path.expanduser("~/.config/openstack/clouds.yaml")
|
||||||
|
+ clouds_yaml = "~/.config/openstack/clouds.yaml"
|
||||||
|
+ if not os.path.exists(os.path.expanduser(clouds_yaml)):
|
||||||
|
+ clouds_yaml = "/etc/openstack/clouds.yaml"
|
||||||
|
+ if not os.path.exists(os.path.expanduser(clouds_yaml)):
|
||||||
|
+ fail_usage("Failed: ~/.config/openstack/clouds.yaml and /etc/openstack/clouds.yaml does not exist")
|
||||||
|
+
|
||||||
|
+ clouds_yaml = os.path.expanduser(clouds_yaml)
|
||||||
|
if os.path.exists(clouds_yaml):
|
||||||
|
with open(clouds_yaml, "r") as yaml_stream:
|
||||||
|
try:
|
||||||
|
@@ -201,22 +208,13 @@ def define_new_opts():
|
||||||
|
"default": "Default",
|
||||||
|
"order": 5,
|
||||||
|
}
|
||||||
|
- all_opt["clouds-yaml"] = {
|
||||||
|
- "getopt": ":",
|
||||||
|
- "longopt": "clouds-yaml",
|
||||||
|
- "help": "--clouds-yaml=[clouds-yaml] Path to the clouds.yaml config file",
|
||||||
|
- "required": "0",
|
||||||
|
- "shortdesc": "clouds.yaml config file",
|
||||||
|
- "default": "~/.config/openstack/clouds.yaml",
|
||||||
|
- "order": 6,
|
||||||
|
- }
|
||||||
|
all_opt["cloud"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
"longopt": "cloud",
|
||||||
|
- "help": "--cloud=[cloud] Openstack cloud (from clouds.yaml).",
|
||||||
|
+ "help": "--cloud=[cloud] Openstack cloud (from ~/.config/openstack/clouds.yaml or /etc/openstack/clouds.yaml).",
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "Cloud from clouds.yaml",
|
||||||
|
- "order": 7,
|
||||||
|
+ "order": 6,
|
||||||
|
}
|
||||||
|
all_opt["openrc"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -224,7 +222,7 @@ def define_new_opts():
|
||||||
|
"help": "--openrc=[openrc] Path to the openrc config file",
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "openrc config file",
|
||||||
|
- "order": 8,
|
||||||
|
+ "order": 7,
|
||||||
|
}
|
||||||
|
all_opt["uuid"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -232,7 +230,7 @@ def define_new_opts():
|
||||||
|
"help": "--uuid=[uuid] Replaced by -n, --plug",
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "Replaced by port/-n/--plug",
|
||||||
|
- "order": 9,
|
||||||
|
+ "order": 8,
|
||||||
|
}
|
||||||
|
all_opt["cacert"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -241,7 +239,7 @@ def define_new_opts():
|
||||||
|
"required": "0",
|
||||||
|
"shortdesc": "SSL X.509 certificates file",
|
||||||
|
"default": "",
|
||||||
|
- "order": 10,
|
||||||
|
+ "order": 9,
|
||||||
|
}
|
||||||
|
all_opt["apitimeout"] = {
|
||||||
|
"getopt": ":",
|
||||||
|
@@ -251,7 +249,7 @@ def define_new_opts():
|
||||||
|
"shortdesc": "Timeout in seconds to use for API calls, default is 60.",
|
||||||
|
"required": "0",
|
||||||
|
"default": 60,
|
||||||
|
- "order": 11,
|
||||||
|
+ "order": 10,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -267,7 +265,6 @@ def main():
|
||||||
|
"project-name",
|
||||||
|
"user-domain-name",
|
||||||
|
"project-domain-name",
|
||||||
|
- "clouds-yaml",
|
||||||
|
"cloud",
|
||||||
|
"openrc",
|
||||||
|
"port",
|
||||||
|
@@ -312,28 +309,26 @@ def main():
|
||||||
|
|
||||||
|
run_delay(options)
|
||||||
|
|
||||||
|
- if options.get("--clouds-yaml"):
|
||||||
|
- if not os.path.exists(os.path.expanduser(options["--clouds-yaml"])):
|
||||||
|
- fail_usage("Failed: {} does not exist".format(options.get("--clouds-yaml")))
|
||||||
|
- if not options.get("--cloud"):
|
||||||
|
- fail_usage("Failed: \"cloud\" not specified")
|
||||||
|
+ if options.get("--cloud"):
|
||||||
|
cloud = get_cloud(options)
|
||||||
|
- username = cloud.get("username")
|
||||||
|
- password = cloud.get("password")
|
||||||
|
- projectname = cloud.get("project_name")
|
||||||
|
+ username = cloud.get("auth").get("username")
|
||||||
|
+ password = cloud.get("auth").get("password")
|
||||||
|
+ projectname = cloud.get("auth").get("project_name")
|
||||||
|
auth_url = None
|
||||||
|
try:
|
||||||
|
- auth_url = cloud.get("auth_url")
|
||||||
|
+ auth_url = cloud.get("auth").get("auth_url")
|
||||||
|
except KeyError:
|
||||||
|
fail_usage("Failed: You have to set the Keystone service endpoint for authorization")
|
||||||
|
- user_domain_name = cloud.get("user_domain_name")
|
||||||
|
- project_domain_name = cloud.get("project_domain_name")
|
||||||
|
+ user_domain_name = cloud.get("auth").get("user_domain_name")
|
||||||
|
+ project_domain_name = cloud.get("auth").get("project_domain_name")
|
||||||
|
caverify = cloud.get("verify")
|
||||||
|
if caverify in [True, False]:
|
||||||
|
options["--ssl-insecure"] = caverify
|
||||||
|
else:
|
||||||
|
options["--cacert"] = caverify
|
||||||
|
- if options.get("--openrc") and os.path.exists(os.path.expanduser(options["--openrc"])):
|
||||||
|
+ elif options.get("--openrc"):
|
||||||
|
+ if not os.path.exists(os.path.expanduser(options["--openrc"])):
|
||||||
|
+ fail_usage("Failed: {} does not exist".format(options.get("--openrc")))
|
||||||
|
source_env(options["--openrc"])
|
||||||
|
env = os.environ
|
||||||
|
username = env.get("OS_USERNAME")
|
||||||
|
diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
|
||||||
|
index 55a57b4d7..67b2191b7 100644
|
||||||
|
--- a/tests/data/metadata/fence_openstack.xml
|
||||||
|
+++ b/tests/data/metadata/fence_openstack.xml
|
||||||
|
@@ -93,16 +93,6 @@
|
||||||
|
<content type="string" default="Default" />
|
||||||
|
<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
|
||||||
|
</parameter>
|
||||||
|
- <parameter name="clouds-yaml" unique="0" required="0" deprecated="1">
|
||||||
|
- <getopt mixed="--clouds-yaml=[clouds-yaml]" />
|
||||||
|
- <content type="string" default="~/.config/openstack/clouds.yaml" />
|
||||||
|
- <shortdesc lang="en">clouds.yaml config file</shortdesc>
|
||||||
|
- </parameter>
|
||||||
|
- <parameter name="clouds_yaml" unique="0" required="0" obsoletes="clouds-yaml">
|
||||||
|
- <getopt mixed="--clouds-yaml=[clouds-yaml]" />
|
||||||
|
- <content type="string" default="~/.config/openstack/clouds.yaml" />
|
||||||
|
- <shortdesc lang="en">clouds.yaml config file</shortdesc>
|
||||||
|
- </parameter>
|
||||||
|
<parameter name="cloud" unique="0" required="0">
|
||||||
|
<getopt mixed="--cloud=[cloud]" />
|
||||||
|
<content type="string" />
|
740
SOURCES/bz2042496-fence_ibm_vpc-fence_ibm_powervs.patch
Normal file
740
SOURCES/bz2042496-fence_ibm_vpc-fence_ibm_powervs.patch
Normal file
@ -0,0 +1,740 @@
|
|||||||
|
From 3078e4d55d3bad2bbf9309785fdb2b53afac8d65 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Tue, 13 Jul 2021 13:39:33 +0200
|
||||||
|
Subject: [PATCH] fence_ibm_vpc/fence_ibm_powervs: new fence agents
|
||||||
|
|
||||||
|
---
|
||||||
|
agents/ibm_powervs/fence_ibm_powervs.py | 202 +++++++++++++++++++
|
||||||
|
agents/ibm_vpc/fence_ibm_vpc.py | 230 ++++++++++++++++++++++
|
||||||
|
tests/data/metadata/fence_ibm_powervs.xml | 134 +++++++++++++
|
||||||
|
tests/data/metadata/fence_ibm_vpc.xml | 134 +++++++++++++
|
||||||
|
5 files changed, 724 insertions(+)
|
||||||
|
create mode 100755 agents/ibm_powervs/fence_ibm_powervs.py
|
||||||
|
create mode 100755 agents/ibm_vpc/fence_ibm_vpc.py
|
||||||
|
create mode 100644 tests/data/metadata/fence_ibm_powervs.xml
|
||||||
|
create mode 100644 tests/data/metadata/fence_ibm_vpc.xml
|
||||||
|
|
||||||
|
diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py
|
||||||
|
new file mode 100755
|
||||||
|
index 000000000..6649771ea
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/agents/ibm_powervs/fence_ibm_powervs.py
|
||||||
|
@@ -0,0 +1,202 @@
|
||||||
|
+#!@PYTHON@ -tt
|
||||||
|
+
|
||||||
|
+import sys
|
||||||
|
+import pycurl, io, json
|
||||||
|
+import logging
|
||||||
|
+import atexit
|
||||||
|
+sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
+from fencing import *
|
||||||
|
+from fencing import fail, run_delay, EC_LOGIN_DENIED, EC_STATUS
|
||||||
|
+
|
||||||
|
+state = {
|
||||||
|
+ "ACTIVE": "on",
|
||||||
|
+ "SHUTOFF": "off",
|
||||||
|
+ "ERROR": "unknown"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+def get_list(conn, options):
|
||||||
|
+ outlets = {}
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ command = "cloud-instances/{}/pvm-instances".format(options["--instance"])
|
||||||
|
+ res = send_command(conn, command)
|
||||||
|
+ except Exception as e:
|
||||||
|
+ logging.debug("Failed: {}".format(e))
|
||||||
|
+ return outlets
|
||||||
|
+
|
||||||
|
+ for r in res["pvmInstances"]:
|
||||||
|
+ if "--verbose" in options:
|
||||||
|
+ logging.debug(json.dumps(r, indent=2))
|
||||||
|
+ outlets[r["pvmInstanceID"]] = (r["serverName"], state[r["status"]])
|
||||||
|
+
|
||||||
|
+ return outlets
|
||||||
|
+
|
||||||
|
+def get_power_status(conn, options):
|
||||||
|
+ try:
|
||||||
|
+ command = "cloud-instances/{}/pvm-instances/{}".format(
|
||||||
|
+ options["--instance"], options["--plug"])
|
||||||
|
+ res = send_command(conn, command)
|
||||||
|
+ result = get_list(conn, options)[options["--plug"]][1]
|
||||||
|
+ except KeyError as e:
|
||||||
|
+ logging.debug("Failed: Unable to get status for {}".format(e))
|
||||||
|
+ fail(EC_STATUS)
|
||||||
|
+
|
||||||
|
+ return result
|
||||||
|
+
|
||||||
|
+def set_power_status(conn, options):
|
||||||
|
+ action = {
|
||||||
|
+ "on" : '{"action" : "start"}',
|
||||||
|
+ "off" : '{"action" : "immediate-shutdown"}',
|
||||||
|
+ }[options["--action"]]
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ send_command(conn, "cloud-instances/{}/pvm-instances/{}/action".format(
|
||||||
|
+ options["--instance"], options["--plug"]), "POST", action)
|
||||||
|
+ except Exception as e:
|
||||||
|
+ logging.debug("Failed: Unable to set power to {} for {}".format(options["--action"], e))
|
||||||
|
+ fail(EC_STATUS)
|
||||||
|
+
|
||||||
|
+def connect(opt):
|
||||||
|
+ conn = pycurl.Curl()
|
||||||
|
+
|
||||||
|
+ ## setup correct URL
|
||||||
|
+ conn.base_url = "https://" + opt["--region"] + ".power-iaas.cloud.ibm.com/pcloud/v1/"
|
||||||
|
+
|
||||||
|
+ if opt["--verbose-level"] > 1:
|
||||||
|
+ conn.setopt(pycurl.VERBOSE, 1)
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.TIMEOUT, int(opt["--shell-timeout"]))
|
||||||
|
+ conn.setopt(pycurl.SSL_VERIFYPEER, 1)
|
||||||
|
+ conn.setopt(pycurl.SSL_VERIFYHOST, 2)
|
||||||
|
+
|
||||||
|
+ # set auth token for later requests
|
||||||
|
+ conn.setopt(pycurl.HTTPHEADER, [
|
||||||
|
+ "Content-Type: application/json",
|
||||||
|
+ "Authorization: Bearer {}".format(opt["--token"]),
|
||||||
|
+ "CRN: {}".format(opt["--crn"]),
|
||||||
|
+ "User-Agent: curl",
|
||||||
|
+ ])
|
||||||
|
+
|
||||||
|
+ return conn
|
||||||
|
+
|
||||||
|
+def disconnect(conn):
|
||||||
|
+ conn.close()
|
||||||
|
+
|
||||||
|
+def send_command(conn, command, method="GET", action=None):
|
||||||
|
+ url = conn.base_url + command
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.URL, url.encode("ascii"))
|
||||||
|
+
|
||||||
|
+ web_buffer = io.BytesIO()
|
||||||
|
+
|
||||||
|
+ if method == "GET":
|
||||||
|
+ conn.setopt(pycurl.POST, 0)
|
||||||
|
+ if method == "POST":
|
||||||
|
+ conn.setopt(pycurl.POSTFIELDS, action)
|
||||||
|
+ if method == "DELETE":
|
||||||
|
+ conn.setopt(pycurl.CUSTOMREQUEST, "DELETE")
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.WRITEFUNCTION, web_buffer.write)
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ conn.perform()
|
||||||
|
+ except Exception as e:
|
||||||
|
+ raise(e)
|
||||||
|
+
|
||||||
|
+ rc = conn.getinfo(pycurl.HTTP_CODE)
|
||||||
|
+ result = web_buffer.getvalue().decode("UTF-8")
|
||||||
|
+
|
||||||
|
+ web_buffer.close()
|
||||||
|
+
|
||||||
|
+ if rc != 200:
|
||||||
|
+ if len(result) > 0:
|
||||||
|
+ raise Exception("{}: {}".format(rc,
|
||||||
|
+ result["value"]["messages"][0]["default_message"]))
|
||||||
|
+ else:
|
||||||
|
+ raise Exception("Remote returned {} for request to {}".format(rc, url))
|
||||||
|
+
|
||||||
|
+ if len(result) > 0:
|
||||||
|
+ result = json.loads(result)
|
||||||
|
+
|
||||||
|
+ logging.debug("url: {}".format(url))
|
||||||
|
+ logging.debug("method: {}".format(method))
|
||||||
|
+ logging.debug("response code: {}".format(rc))
|
||||||
|
+ logging.debug("result: {}\n".format(result))
|
||||||
|
+
|
||||||
|
+ return result
|
||||||
|
+
|
||||||
|
+def define_new_opts():
|
||||||
|
+ all_opt["token"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "token",
|
||||||
|
+ "help" : "--token=[token] Bearer Token",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "Bearer Token",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["crn"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "crn",
|
||||||
|
+ "help" : "--crn=[crn] CRN",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "CRN",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["instance"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "instance",
|
||||||
|
+ "help" : "--instance=[instance] PowerVS Instance",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "PowerVS Instance",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["region"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "region",
|
||||||
|
+ "help" : "--region=[region] Region",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "Region",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def main():
|
||||||
|
+ device_opt = [
|
||||||
|
+ "token",
|
||||||
|
+ "crn",
|
||||||
|
+ "instance",
|
||||||
|
+ "region",
|
||||||
|
+ "port",
|
||||||
|
+ "no_password",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ atexit.register(atexit_handler)
|
||||||
|
+ define_new_opts()
|
||||||
|
+
|
||||||
|
+ all_opt["shell_timeout"]["default"] = "15"
|
||||||
|
+ all_opt["power_timeout"]["default"] = "30"
|
||||||
|
+ all_opt["power_wait"]["default"] = "1"
|
||||||
|
+
|
||||||
|
+ options = check_input(device_opt, process_input(device_opt))
|
||||||
|
+
|
||||||
|
+ docs = {}
|
||||||
|
+ docs["shortdesc"] = "Fence agent for IBM PowerVS"
|
||||||
|
+ docs["longdesc"] = """fence_ibm_powervs is an I/O Fencing agent which can be \
|
||||||
|
+used with IBM PowerVS to fence virtual machines."""
|
||||||
|
+ docs["vendorurl"] = "https://www.ibm.com"
|
||||||
|
+ show_docs(options, docs)
|
||||||
|
+
|
||||||
|
+ ####
|
||||||
|
+ ## Fence operations
|
||||||
|
+ ####
|
||||||
|
+ run_delay(options)
|
||||||
|
+
|
||||||
|
+ conn = connect(options)
|
||||||
|
+ atexit.register(disconnect, conn)
|
||||||
|
+
|
||||||
|
+ result = fence_action(conn, options, set_power_status, get_power_status, get_list)
|
||||||
|
+
|
||||||
|
+ sys.exit(result)
|
||||||
|
+
|
||||||
|
+if __name__ == "__main__":
|
||||||
|
+ main()
|
||||||
|
diff --git a/agents/ibm_vpc/fence_ibm_vpc.py b/agents/ibm_vpc/fence_ibm_vpc.py
|
||||||
|
new file mode 100755
|
||||||
|
index 000000000..9f84f7b2d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/agents/ibm_vpc/fence_ibm_vpc.py
|
||||||
|
@@ -0,0 +1,230 @@
|
||||||
|
+#!@PYTHON@ -tt
|
||||||
|
+
|
||||||
|
+import sys
|
||||||
|
+import pycurl, io, json
|
||||||
|
+import logging
|
||||||
|
+import atexit
|
||||||
|
+sys.path.append("@FENCEAGENTSLIBDIR@")
|
||||||
|
+from fencing import *
|
||||||
|
+from fencing import fail, run_delay, EC_LOGIN_DENIED, EC_STATUS
|
||||||
|
+
|
||||||
|
+state = {
|
||||||
|
+ "running": "on",
|
||||||
|
+ "stopped": "off",
|
||||||
|
+ "starting": "unknown",
|
||||||
|
+ "stopping": "unknown",
|
||||||
|
+ "restarting": "unknown",
|
||||||
|
+ "pending": "unknown",
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+def get_list(conn, options):
|
||||||
|
+ outlets = {}
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ command = "instances?version=2021-05-25&generation=2&limit={}".format(options["--limit"])
|
||||||
|
+ res = send_command(conn, command)
|
||||||
|
+ except Exception as e:
|
||||||
|
+ logging.debug("Failed: Unable to get list: {}".format(e))
|
||||||
|
+ return outlets
|
||||||
|
+
|
||||||
|
+ for r in res["instances"]:
|
||||||
|
+ if options["--verbose-level"] > 1:
|
||||||
|
+ logging.debug("Node:\n{}".format(json.dumps(r, indent=2)))
|
||||||
|
+ logging.debug("Status: " + state[r["status"]])
|
||||||
|
+ outlets[r["id"]] = (r["name"], state[r["status"]])
|
||||||
|
+
|
||||||
|
+ return outlets
|
||||||
|
+
|
||||||
|
+def get_power_status(conn, options):
|
||||||
|
+ try:
|
||||||
|
+ command = "instances/{}?version=2021-05-25&generation=2".format(options["--plug"])
|
||||||
|
+ res = send_command(conn, command)
|
||||||
|
+ result = state[res["status"]]
|
||||||
|
+ if options["--verbose-level"] > 1:
|
||||||
|
+ logging.debug("Result:\n{}".format(json.dumps(res, indent=2)))
|
||||||
|
+ logging.debug("Status: " + result)
|
||||||
|
+ except Exception as e:
|
||||||
|
+ logging.debug("Failed: Unable to get status for {}: {}".format(options["--plug"], e))
|
||||||
|
+ fail(EC_STATUS)
|
||||||
|
+
|
||||||
|
+ return result
|
||||||
|
+
|
||||||
|
+def set_power_status(conn, options):
|
||||||
|
+ action = {
|
||||||
|
+ "on" : '{"type" : "start"}',
|
||||||
|
+ "off" : '{"type" : "stop"}',
|
||||||
|
+ }[options["--action"]]
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ command = "instances/{}/actions?version=2021-05-25&generation=2".format(options["--plug"])
|
||||||
|
+ send_command(conn, command, "POST", action, 201)
|
||||||
|
+ except Exception as e:
|
||||||
|
+ logging.debug("Failed: Unable to set power to {} for {}".format(options["--action"], e))
|
||||||
|
+ fail(EC_STATUS)
|
||||||
|
+
|
||||||
|
+def get_bearer_token(conn, options):
|
||||||
|
+ token = None
|
||||||
|
+ try:
|
||||||
|
+ conn.setopt(pycurl.HTTPHEADER, [
|
||||||
|
+ "Content-Type: application/x-www-form-urlencoded",
|
||||||
|
+ "User-Agent: curl",
|
||||||
|
+ ])
|
||||||
|
+ token = send_command(conn, "https://iam.cloud.ibm.com/identity/token", "POST", "grant_type=urn:ibm:params:oauth:grant-type:apikey&apikey={}".format(options["--apikey"]))["access_token"]
|
||||||
|
+ except Exception:
|
||||||
|
+ logging.error("Failed: Unable to authenticate")
|
||||||
|
+ fail(EC_LOGIN_DENIED)
|
||||||
|
+
|
||||||
|
+ return token
|
||||||
|
+
|
||||||
|
+def connect(opt):
|
||||||
|
+ conn = pycurl.Curl()
|
||||||
|
+
|
||||||
|
+ ## setup correct URL
|
||||||
|
+ conn.base_url = "https://" + opt["--region"] + ".iaas.cloud.ibm.com/v1/"
|
||||||
|
+
|
||||||
|
+ if opt["--verbose-level"] > 1:
|
||||||
|
+ conn.setopt(pycurl.VERBOSE, 1)
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.TIMEOUT, int(opt["--shell-timeout"]))
|
||||||
|
+ conn.setopt(pycurl.SSL_VERIFYPEER, 1)
|
||||||
|
+ conn.setopt(pycurl.SSL_VERIFYHOST, 2)
|
||||||
|
+
|
||||||
|
+ # get bearer token
|
||||||
|
+ bearer_token = get_bearer_token(conn, opt)
|
||||||
|
+
|
||||||
|
+ # set auth token for later requests
|
||||||
|
+ conn.setopt(pycurl.HTTPHEADER, [
|
||||||
|
+ "Content-Type: application/json",
|
||||||
|
+ "Authorization: Bearer {}".format(bearer_token),
|
||||||
|
+ "User-Agent: curl",
|
||||||
|
+ ])
|
||||||
|
+
|
||||||
|
+ return conn
|
||||||
|
+
|
||||||
|
+def disconnect(conn):
|
||||||
|
+ conn.close()
|
||||||
|
+
|
||||||
|
+def send_command(conn, command, method="GET", action=None, expected_rc=200):
|
||||||
|
+ if not command.startswith("https"):
|
||||||
|
+ url = conn.base_url + command
|
||||||
|
+ else:
|
||||||
|
+ url = command
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.URL, url.encode("ascii"))
|
||||||
|
+
|
||||||
|
+ web_buffer = io.BytesIO()
|
||||||
|
+
|
||||||
|
+ if method == "GET":
|
||||||
|
+ conn.setopt(pycurl.POST, 0)
|
||||||
|
+ if method == "POST":
|
||||||
|
+ conn.setopt(pycurl.POSTFIELDS, action)
|
||||||
|
+ if method == "DELETE":
|
||||||
|
+ conn.setopt(pycurl.CUSTOMREQUEST, "DELETE")
|
||||||
|
+
|
||||||
|
+ conn.setopt(pycurl.WRITEFUNCTION, web_buffer.write)
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ conn.perform()
|
||||||
|
+ except Exception as e:
|
||||||
|
+ raise(e)
|
||||||
|
+
|
||||||
|
+ rc = conn.getinfo(pycurl.HTTP_CODE)
|
||||||
|
+ result = web_buffer.getvalue().decode("UTF-8")
|
||||||
|
+
|
||||||
|
+ web_buffer.close()
|
||||||
|
+
|
||||||
|
+ # actions (start/stop/reboot) report 201 when they've been created
|
||||||
|
+ if rc != expected_rc:
|
||||||
|
+ logging.debug("rc: {}, result: {}".format(rc, result))
|
||||||
|
+ if len(result) > 0:
|
||||||
|
+ raise Exception("{}: {}".format(rc,
|
||||||
|
+ result["value"]["messages"][0]["default_message"]))
|
||||||
|
+ else:
|
||||||
|
+ raise Exception("Remote returned {} for request to {}".format(rc, url))
|
||||||
|
+
|
||||||
|
+ if len(result) > 0:
|
||||||
|
+ result = json.loads(result)
|
||||||
|
+
|
||||||
|
+ logging.debug("url: {}".format(url))
|
||||||
|
+ logging.debug("method: {}".format(method))
|
||||||
|
+ logging.debug("response code: {}".format(rc))
|
||||||
|
+ logging.debug("result: {}\n".format(result))
|
||||||
|
+
|
||||||
|
+ return result
|
||||||
|
+
|
||||||
|
+def define_new_opts():
|
||||||
|
+ all_opt["apikey"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "apikey",
|
||||||
|
+ "help" : "--apikey=[key] API Key",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "API Key",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["instance"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "instance",
|
||||||
|
+ "help" : "--instance=[instance] Cloud Instance",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "Cloud Instance",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["region"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "region",
|
||||||
|
+ "help" : "--region=[region] Region",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "shortdesc" : "Region",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+ all_opt["limit"] = {
|
||||||
|
+ "getopt" : ":",
|
||||||
|
+ "longopt" : "limit",
|
||||||
|
+ "help" : "--limit=[number] Limit number of nodes returned by API",
|
||||||
|
+ "required" : "1",
|
||||||
|
+ "default": 50,
|
||||||
|
+ "shortdesc" : "Number of nodes returned by API",
|
||||||
|
+ "order" : 0
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def main():
|
||||||
|
+ device_opt = [
|
||||||
|
+ "apikey",
|
||||||
|
+ "instance",
|
||||||
|
+ "region",
|
||||||
|
+ "limit",
|
||||||
|
+ "port",
|
||||||
|
+ "no_password",
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ atexit.register(atexit_handler)
|
||||||
|
+ define_new_opts()
|
||||||
|
+
|
||||||
|
+ all_opt["shell_timeout"]["default"] = "15"
|
||||||
|
+ all_opt["power_timeout"]["default"] = "30"
|
||||||
|
+ all_opt["power_wait"]["default"] = "1"
|
||||||
|
+
|
||||||
|
+ options = check_input(device_opt, process_input(device_opt))
|
||||||
|
+
|
||||||
|
+ docs = {}
|
||||||
|
+ docs["shortdesc"] = "Fence agent for IBM Cloud VPC"
|
||||||
|
+ docs["longdesc"] = """fence_ibm_vpc is an I/O Fencing agent which can be \
|
||||||
|
+used with IBM Cloud VPC to fence virtual machines."""
|
||||||
|
+ docs["vendorurl"] = "https://www.ibm.com"
|
||||||
|
+ show_docs(options, docs)
|
||||||
|
+
|
||||||
|
+ ####
|
||||||
|
+ ## Fence operations
|
||||||
|
+ ####
|
||||||
|
+ run_delay(options)
|
||||||
|
+
|
||||||
|
+ conn = connect(options)
|
||||||
|
+ atexit.register(disconnect, conn)
|
||||||
|
+
|
||||||
|
+ result = fence_action(conn, options, set_power_status, get_power_status, get_list)
|
||||||
|
+
|
||||||
|
+ sys.exit(result)
|
||||||
|
+
|
||||||
|
+if __name__ == "__main__":
|
||||||
|
+ main()
|
||||||
|
diff --git a/tests/data/metadata/fence_ibm_powervs.xml b/tests/data/metadata/fence_ibm_powervs.xml
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..fe86331bd
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/data/metadata/fence_ibm_powervs.xml
|
||||||
|
@@ -0,0 +1,134 @@
|
||||||
|
+<?xml version="1.0" ?>
|
||||||
|
+<resource-agent name="fence_ibm_powervs" shortdesc="Fence agent for IBM PowerVS" >
|
||||||
|
+<longdesc>fence_ibm_powervs is an I/O Fencing agent which can be used with IBM PowerVS to fence virtual machines.</longdesc>
|
||||||
|
+<vendor-url>https://www.ibm.com</vendor-url>
|
||||||
|
+<parameters>
|
||||||
|
+ <parameter name="crn" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--crn=[crn]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">CRN</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="instance" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--instance=[instance]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">PowerVS Instance</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="region" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--region=[region]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Region</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="token" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--token=[token]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Bearer Token</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="action" unique="0" required="1">
|
||||||
|
+ <getopt mixed="-o, --action=[action]" />
|
||||||
|
+ <content type="string" default="reboot" />
|
||||||
|
+ <shortdesc lang="en">Fencing action</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="plug" unique="0" required="1" obsoletes="port">
|
||||||
|
+ <getopt mixed="-n, --plug=[id]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="port" unique="0" required="1" deprecated="1">
|
||||||
|
+ <getopt mixed="-n, --plug=[id]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="quiet" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-q, --quiet" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="verbose" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-v, --verbose" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="verbose_level" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--verbose-level" />
|
||||||
|
+ <content type="integer" />
|
||||||
|
+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="debug" unique="0" required="0" deprecated="1">
|
||||||
|
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="debug_file" unique="0" required="0" obsoletes="debug">
|
||||||
|
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="version" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-V, --version" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Display version information and exit</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="help" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-h, --help" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Display help and exit</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="separator" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-C, --separator=[char]" />
|
||||||
|
+ <content type="string" default="," />
|
||||||
|
+ <shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="delay" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--delay=[seconds]" />
|
||||||
|
+ <content type="second" default="0" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="disable_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--disable-timeout=[true/false]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Disable timeout (true/false) (default: true when run from Pacemaker 2.0+)</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="login_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--login-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="5" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="power_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--power-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="30" />
|
||||||
|
+ <shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="power_wait" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--power-wait=[seconds]" />
|
||||||
|
+ <content type="second" default="1" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="shell_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--shell-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="15" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="stonith_status_sleep" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--stonith-status-sleep=[seconds]" />
|
||||||
|
+ <content type="second" default="1" />
|
||||||
|
+ <shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="retry_on" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--retry-on=[attempts]" />
|
||||||
|
+ <content type="integer" default="1" />
|
||||||
|
+ <shortdesc lang="en">Count of attempts to retry power on</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+</parameters>
|
||||||
|
+<actions>
|
||||||
|
+ <action name="on" automatic="0"/>
|
||||||
|
+ <action name="off" />
|
||||||
|
+ <action name="reboot" />
|
||||||
|
+ <action name="status" />
|
||||||
|
+ <action name="list" />
|
||||||
|
+ <action name="list-status" />
|
||||||
|
+ <action name="monitor" />
|
||||||
|
+ <action name="metadata" />
|
||||||
|
+ <action name="manpage" />
|
||||||
|
+ <action name="validate-all" />
|
||||||
|
+</actions>
|
||||||
|
+</resource-agent>
|
||||||
|
diff --git a/tests/data/metadata/fence_ibm_vpc.xml b/tests/data/metadata/fence_ibm_vpc.xml
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..926efcaa0
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/data/metadata/fence_ibm_vpc.xml
|
||||||
|
@@ -0,0 +1,134 @@
|
||||||
|
+<?xml version="1.0" ?>
|
||||||
|
+<resource-agent name="fence_ibm_vpc" shortdesc="Fence agent for IBM Cloud VPC" >
|
||||||
|
+<longdesc>fence_ibm_vpc is an I/O Fencing agent which can be used with IBM Cloud VPC to fence virtual machines.</longdesc>
|
||||||
|
+<vendor-url>https://www.ibm.com</vendor-url>
|
||||||
|
+<parameters>
|
||||||
|
+ <parameter name="apikey" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--apikey=[key]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">API Key</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="instance" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--instance=[instance]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Cloud Instance</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="limit" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--limit=[number]" />
|
||||||
|
+ <content type="string" default="50" />
|
||||||
|
+ <shortdesc lang="en">Number of nodes returned by API</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="region" unique="0" required="1">
|
||||||
|
+ <getopt mixed="--region=[region]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Region</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="action" unique="0" required="1">
|
||||||
|
+ <getopt mixed="-o, --action=[action]" />
|
||||||
|
+ <content type="string" default="reboot" />
|
||||||
|
+ <shortdesc lang="en">Fencing action</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="plug" unique="0" required="1" obsoletes="port">
|
||||||
|
+ <getopt mixed="-n, --plug=[id]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="port" unique="0" required="1" deprecated="1">
|
||||||
|
+ <getopt mixed="-n, --plug=[id]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="quiet" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-q, --quiet" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="verbose" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-v, --verbose" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="verbose_level" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--verbose-level" />
|
||||||
|
+ <content type="integer" />
|
||||||
|
+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="debug" unique="0" required="0" deprecated="1">
|
||||||
|
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="debug_file" unique="0" required="0" obsoletes="debug">
|
||||||
|
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="version" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-V, --version" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Display version information and exit</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="help" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-h, --help" />
|
||||||
|
+ <content type="boolean" />
|
||||||
|
+ <shortdesc lang="en">Display help and exit</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="separator" unique="0" required="0">
|
||||||
|
+ <getopt mixed="-C, --separator=[char]" />
|
||||||
|
+ <content type="string" default="," />
|
||||||
|
+ <shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="delay" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--delay=[seconds]" />
|
||||||
|
+ <content type="second" default="0" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="disable_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--disable-timeout=[true/false]" />
|
||||||
|
+ <content type="string" />
|
||||||
|
+ <shortdesc lang="en">Disable timeout (true/false) (default: true when run from Pacemaker 2.0+)</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="login_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--login-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="5" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="power_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--power-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="30" />
|
||||||
|
+ <shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="power_wait" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--power-wait=[seconds]" />
|
||||||
|
+ <content type="second" default="1" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="shell_timeout" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--shell-timeout=[seconds]" />
|
||||||
|
+ <content type="second" default="15" />
|
||||||
|
+ <shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="stonith_status_sleep" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--stonith-status-sleep=[seconds]" />
|
||||||
|
+ <content type="second" default="1" />
|
||||||
|
+ <shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+ <parameter name="retry_on" unique="0" required="0">
|
||||||
|
+ <getopt mixed="--retry-on=[attempts]" />
|
||||||
|
+ <content type="integer" default="1" />
|
||||||
|
+ <shortdesc lang="en">Count of attempts to retry power on</shortdesc>
|
||||||
|
+ </parameter>
|
||||||
|
+</parameters>
|
||||||
|
+<actions>
|
||||||
|
+ <action name="on" automatic="0"/>
|
||||||
|
+ <action name="off" />
|
||||||
|
+ <action name="reboot" />
|
||||||
|
+ <action name="status" />
|
||||||
|
+ <action name="list" />
|
||||||
|
+ <action name="list-status" />
|
||||||
|
+ <action name="monitor" />
|
||||||
|
+ <action name="metadata" />
|
||||||
|
+ <action name="manpage" />
|
||||||
|
+ <action name="validate-all" />
|
||||||
|
+</actions>
|
||||||
|
+</resource-agent>
|
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
|
1755
SPECS/fence-agents.spec
Normal file
1755
SPECS/fence-agents.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user