ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

openshift_raw & openshift_scale: fix broken import

Browse source
This commit is contained in:
Pierre-Louis Bonicoli 2018-04-23 02:46:42 +02:00 • committed by Matt Clay
commit afef20827b
3 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/module_utils/k8s/common.py
View file

@ -101,24 +101,18 @@ class KubernetesAnsibleModule(AnsibleModule):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if not HAS_K8S_MODULE_HELPER:
raise Exception(
"This module requires the OpenShift Python client. Try `pip install openshift`"
)
if not HAS_YAML:
raise Exception(
"This module requires PyYAML. Try `pip install PyYAML`"
)
if not HAS_STRING_UTILS:
raise Exception(
"This module requires Python string utils. Try `pip install python-string-utils`"
)
kwargs['argument_spec'] = self.argspec kwargs['argument_spec'] = self.argspec
AnsibleModule.__init__(self, *args, **kwargs) AnsibleModule.__init__(self, *args, **kwargs)
if not HAS_K8S_MODULE_HELPER:
self.fail_json(msg="This module requires the OpenShift Python client. Try `pip install openshift`")
if not HAS_YAML:
self.fail_json(msg="This module requires PyYAML. Try `pip install PyYAML`")
if not HAS_STRING_UTILS:
self.fail_json(msg="This module requires Python string utils. Try `pip install python-string-utils`")
@property @property
def argspec(self): def argspec(self):
raise NotImplementedError() raise NotImplementedError()

2
test/sanity/import/skip.txt
View file

@ -1,7 +1,5 @@
lib/ansible/modules/clustering/k8s/k8s_raw.py lib/ansible/modules/clustering/k8s/k8s_raw.py
lib/ansible/modules/clustering/k8s/k8s_scale.py lib/ansible/modules/clustering/k8s/k8s_scale.py
lib/ansible/modules/clustering/openshift/openshift_raw.py
lib/ansible/modules/clustering/openshift/openshift_scale.py
lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py
lib/ansible/modules/network/radware/vdirect_commit.py lib/ansible/modules/network/radware/vdirect_commit.py
lib/ansible/modules/network/radware/vdirect_file.py lib/ansible/modules/network/radware/vdirect_file.py

4
test/sanity/validate-modules/ignore.txt
View file

@ -669,10 +669,6 @@ lib/ansible/modules/clustering/k8s/_kubernetes.py E322
lib/ansible/modules/clustering/k8s/_kubernetes.py E323 lib/ansible/modules/clustering/k8s/_kubernetes.py E323
lib/ansible/modules/clustering/k8s/_kubernetes.py E324 lib/ansible/modules/clustering/k8s/_kubernetes.py E324
lib/ansible/modules/clustering/k8s/_kubernetes.py E325 lib/ansible/modules/clustering/k8s/_kubernetes.py E325
lib/ansible/modules/clustering/k8s/k8s_raw.py E321
lib/ansible/modules/clustering/k8s/k8s_scale.py E321
lib/ansible/modules/clustering/openshift/openshift_raw.py E321
lib/ansible/modules/clustering/openshift/openshift_scale.py E321
lib/ansible/modules/clustering/znode.py E326 lib/ansible/modules/clustering/znode.py E326
lib/ansible/modules/commands/command.py E322 lib/ansible/modules/commands/command.py E322
lib/ansible/modules/commands/command.py E323 lib/ansible/modules/commands/command.py E323