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

Rename base_domain to name_suffix, make adjustments based on PR feedback

Browse source
This commit is contained in:
Andrew Dolgov 2022-11-27 09:58:56 +03:00 • committed by Yusuke Tsutsumi
parent 0114ee23d5
commit 32e7eea25f
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

@ -48,8 +48,8 @@ DOCUMENTATION = """
'public_ip', 'private_ip', 'name' or 'labels.vm_name'. 'public_ip', 'private_ip', 'name' or 'labels.vm_name'.
default: ['public_ip', 'private_ip', 'name'] default: ['public_ip', 'private_ip', 'name']
type: list type: list
base_domain: name_suffix:
description: Custom domain suffix to append to all hosts. description: Custom domain suffix. If set, this string will be appended to all hosts.
default: "" default: ""
type: string type: string
required: False required: False
@ -136,7 +136,7 @@ keyed_groups:
# Create groups from GCE labels # Create groups from GCE labels
- prefix: gcp - prefix: gcp
key: labels key: labels
base_domain: .example.com name_suffix: .example.com
hostnames: hostnames:
# List host by name instead of the default public ip # List host by name instead of the default public ip
- name - name
@ -170,10 +170,10 @@ class GcpMockModule(object):
class GcpInstance(object): class GcpInstance(object):
def __init__(self, json, hostname_ordering, project_disks, should_format=True, base_domain=""): def __init__(self, json, hostname_ordering, project_disks, should_format=True, name_suffix=""):
self.hostname_ordering = hostname_ordering self.hostname_ordering = hostname_ordering
self.project_disks = project_disks self.project_disks = project_disks
self.base_domain = base_domain self.name_suffix = name_suffix
self.json = json self.json = json
if should_format: if should_format:
self.convert() self.convert()
@ -244,7 +244,7 @@ class GcpInstance(object):
elif order == "private_ip": elif order == "private_ip":
name = self._get_privateip() name = self._get_privateip()
elif order == "name": elif order == "name":
name = self.json[u"name"] + self.base_domain name = self.json[u"name"] + self.name_suffix
else: else:
raise AnsibleParserError("%s is not a valid hostname precedent" % order) raise AnsibleParserError("%s is not a valid hostname precedent" % order)
@ -429,12 +429,11 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
if self.get_option("hostnames"): if self.get_option("hostnames"):
hostname_ordering = self.get_option("hostnames") hostname_ordering = self.get_option("hostnames")
if self.get_option("base_domain"): name_suffix = self.get_option("name_suffix")
base_domain = self.get_option("base_domain")
for host_json in items: for host_json in items:
host = GcpInstance( host = GcpInstance(
host_json, hostname_ordering, project_disks, format_items, base_domain host_json, hostname_ordering, project_disks, format_items, name_suffix
) )
self._populate_host(host) self._populate_host(host)