ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-04-09 04:10:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Not native, but text (#55676)

Browse source 
* use to_text instead of to_native
* cleaned up some imports and other pyflakisms
* fix missing lib messages
This commit is contained in:
Brian Coca 2019-05-24 14:49:04 -04:00 • committed by Alex Stephen
parent 0d88614720
commit 0752ca5bed
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/inventory/gcp_compute.py
View file

@ -120,16 +120,11 @@ compose:
import json import json
from ansible.errors import AnsibleError, AnsibleParserError from ansible.errors import AnsibleError, AnsibleParserError
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_text
from ansible.module_utils.gcp_utils import GcpSession, navigate_hash, GcpRequestException from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.gcp_utils import GcpSession, navigate_hash, GcpRequestException, HAS_GOOGLE_LIBRARIES
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
try:
import google.auth
import requests
except ImportError:
raise AnsibleError('The gcp dynamic inventory plugin requires the requests and google-auth libraries')
# Mocking a module to reuse module_utils # Mocking a module to reuse module_utils
class GcpMockModule(object): class GcpMockModule(object):
@ -161,7 +156,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
try: try:
self.inventory.set_variable(hostname, self.get_option('vars_prefix') + key, item[key]) self.inventory.set_variable(hostname, self.get_option('vars_prefix') + key, item[key])
except (ValueError, TypeError) as e: except (ValueError, TypeError) as e:
self.display.warning("Could not set host info hostvar for %s, skipping %s: %s" % (hostname, key, to_native(e))) self.display.warning("Could not set host info hostvar for %s, skipping %s: %s" % (hostname, key, to_text(e)))
self.inventory.add_child('all', hostname) self.inventory.add_child('all', hostname)
def verify_file(self, path): def verify_file(self, path):
@ -421,6 +416,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
return interface[u'networkIP'] return interface[u'networkIP']
def parse(self, inventory, loader, path, cache=True): def parse(self, inventory, loader, path, cache=True):
if not HAS_GOOGLE_LIBRARIES:
raise AnsibleParserError('gce inventory plugin cannot start: %s' % missing_required_lib('google-auth'))
super(InventoryModule, self).parse(inventory, loader, path) super(InventoryModule, self).parse(inventory, loader, path)
config_data = {} config_data = {}