diff --git a/lib/ansible/modules/cloud/google/gcdns_zone.py b/lib/ansible/modules/cloud/google/gcdns_zone.py index cd7f89ea7d..b17f267a69 100644 --- a/lib/ansible/modules/cloud/google/gcdns_zone.py +++ b/lib/ansible/modules/cloud/google/gcdns_zone.py @@ -26,7 +26,6 @@ description: version_added: "2.2" author: "William Albert (@walbert947)" requirements: - - "python >= 2.6" - "apache-libcloud >= 0.19.0" options: state: @@ -124,9 +123,12 @@ try: from libcloud.common.google import ResourceExistsError from libcloud.common.google import ResourceNotFoundError from libcloud.dns.types import Provider + # The libcloud Google Cloud DNS provider. + PROVIDER = Provider.GOOGLE HAS_LIBCLOUD = True except ImportError: HAS_LIBCLOUD = False + PROVIDER = None from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.gcdns import gcdns_connect @@ -141,9 +143,6 @@ from ansible.module_utils.gcdns import gcdns_connect # deprecated and decommissioned. MINIMUM_LIBCLOUD_VERSION = '0.19.0' -# The libcloud Google Cloud DNS provider. -PROVIDER = Provider.GOOGLE - # The URL used to verify ownership of a zone in Google Cloud DNS. ZONE_VERIFICATION_URL = 'https://www.google.com/webmasters/verification/' diff --git a/test/sanity/import/skip.txt b/test/sanity/import/skip.txt index bd0f6768ec..772854808d 100644 --- a/test/sanity/import/skip.txt +++ b/test/sanity/import/skip.txt @@ -4,7 +4,6 @@ lib/ansible/modules/cloud/azure/azure.py lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py -lib/ansible/modules/cloud/google/gcdns_zone.py lib/ansible/modules/cloud/webfaction/webfaction_app.py lib/ansible/modules/cloud/webfaction/webfaction_db.py lib/ansible/modules/cloud/webfaction/webfaction_domain.py