cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gcdns_zone: fix broken import (#34076)

Browse source 
* fix broken import
* whole project requires Python >= 2.6
This commit is contained in:
Pilou 2018-01-04 18:32:47 +01:00 committed by Matt Clay
parent 19f5d969c5
commit bd38359ddc
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/google/gcdns_zone.py
View file

@ -26,7 +26,6 @@ description:
version_added: "2.2" version_added: "2.2"
author: "William Albert (@walbert947)" author: "William Albert (@walbert947)"
requirements: requirements:
- "python >= 2.6"
- "apache-libcloud >= 0.19.0" - "apache-libcloud >= 0.19.0"
options: options:
state: state:
@ -124,9 +123,12 @@ try:
from libcloud.common.google import ResourceExistsError from libcloud.common.google import ResourceExistsError
from libcloud.common.google import ResourceNotFoundError from libcloud.common.google import ResourceNotFoundError
from libcloud.dns.types import Provider from libcloud.dns.types import Provider
# The libcloud Google Cloud DNS provider.
PROVIDER = Provider.GOOGLE
HAS_LIBCLOUD = True HAS_LIBCLOUD = True
except ImportError: except ImportError:
HAS_LIBCLOUD = False HAS_LIBCLOUD = False
PROVIDER = None
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.gcdns import gcdns_connect from ansible.module_utils.gcdns import gcdns_connect
@ -141,9 +143,6 @@ from ansible.module_utils.gcdns import gcdns_connect
# deprecated and decommissioned. # deprecated and decommissioned.
MINIMUM_LIBCLOUD_VERSION = '0.19.0' 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. # The URL used to verify ownership of a zone in Google Cloud DNS.
ZONE_VERIFICATION_URL = 'https://www.google.com/webmasters/verification/' ZONE_VERIFICATION_URL = 'https://www.google.com/webmasters/verification/'

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

@ -4,7 +4,6 @@ lib/ansible/modules/cloud/azure/azure.py
lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py
lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.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_app.py
lib/ansible/modules/cloud/webfaction/webfaction_db.py lib/ansible/modules/cloud/webfaction/webfaction_db.py
lib/ansible/modules/cloud/webfaction/webfaction_domain.py lib/ansible/modules/cloud/webfaction/webfaction_domain.py