a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16879 from alikins/gce_module_utils 

Fix import of gce/gcdns without a libcloud module
pull/4420/head
Ryan Brown 2016-08-04 16:16:01 -04:00 committed by GitHub
parent 159aa26b36 fa1d55f683
commit 4f7996fbc1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/module_utils/gcdns.py
View File

@ -40,11 +40,12 @@ except ImportError:
USER_AGENT_PRODUCT = "Ansible-gcdns" USER_AGENT_PRODUCT = "Ansible-gcdns"
USER_AGENT_VERSION = "v1" USER_AGENT_VERSION = "v1"
def gcdns_connect(module, provider=Provider.GOOGLE): def gcdns_connect(module, provider=None):
"""Return a GCP connection for Google Cloud DNS.""" """Return a GCP connection for Google Cloud DNS."""
if not HAS_LIBCLOUD_BASE: if not HAS_LIBCLOUD_BASE:
module.fail_json(msg='libcloud must be installed to use this module') module.fail_json(msg='libcloud must be installed to use this module')
provider = provider or Provider.GOOGLE
return gcp_connect(module, provider, get_driver, USER_AGENT_PRODUCT, USER_AGENT_VERSION) return gcp_connect(module, provider, get_driver, USER_AGENT_PRODUCT, USER_AGENT_VERSION)
def unexpected_error_msg(error): def unexpected_error_msg(error):

3
lib/ansible/module_utils/gce.py
View File

@ -40,10 +40,11 @@ except ImportError:
USER_AGENT_PRODUCT = "Ansible-gce" USER_AGENT_PRODUCT = "Ansible-gce"
USER_AGENT_VERSION = "v1" USER_AGENT_VERSION = "v1"
def gce_connect(module, provider=Provider.GCE): def gce_connect(module, provider=None):
"""Return a GCP connection for Google Compute Engine.""" """Return a GCP connection for Google Compute Engine."""
if not HAS_LIBCLOUD_BASE: if not HAS_LIBCLOUD_BASE:
module.fail_json(msg='libcloud must be installed to use this module') module.fail_json(msg='libcloud must be installed to use this module')
provider = provider or Provider.GCE
return gcp_connect(module, provider, get_driver, USER_AGENT_PRODUCT, USER_AGENT_VERSION) return gcp_connect(module, provider, get_driver, USER_AGENT_PRODUCT, USER_AGENT_VERSION)