ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-09-29 21:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding disk reconciliation to gcp_compute_instance

Browse source 
There was no logic around attaching disks to existing instances. I am
explicitly only attaching persistent disks as per the attachDisk API
This commit is contained in:
Jorge Gallegos 2025-09-10 11:24:56 -07:00
commit a05a7be02a
No known key found for this signature in database
1 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
plugins/modules/gcp_compute_instance.py
View file

@ -1216,8 +1216,7 @@ def main():
if fetch: if fetch:
if state == 'present': if state == 'present':
if is_different(module, fetch): if is_different(module, fetch):
update(module, self_link(module), kind, fetch) fetch = update(module, self_link(module), kind, fetch)
fetch = fetch_resource(module, self_link(module), kind)
changed = True changed = True
else: else:
delete(module, self_link(module), kind) delete(module, self_link(module), kind)
@ -1259,8 +1258,36 @@ def update_fields(module, request, response):
machine_type_update(module, request, response) machine_type_update(module, request, response)
if response.get('shieldedInstanceConfig') != request.get('shieldedInstanceConfig'): if response.get('shieldedInstanceConfig') != request.get('shieldedInstanceConfig'):
shielded_instance_config_update(module, request, response) shielded_instance_config_update(module, request, response)
if response.get('disks') != request.get('disks'):
extra_disks_update(module, request, response)
def extra_disks_update(module, request, response):
auth = GcpSession(module, 'compute')
# fetch all non-boot (i.e. additional) disks to attach
# but discard local disks (if defined) because they can
# only be attached to instances at creation time anyway
req_disks = set()
for d in request.get('disks', []):
if not d.get('boot'):
if d.get('source'):
req_disks.add(d['source'])
else:
module.warn(
'Non-persistent disks can only be attached at creation time, '
'changed status might be incorrect.')
rsp_disks = set()
for d in response.get('disks', []):
if d.get('source') and not d.get('boot'):
rsp_disks.add(d['source'])
for d in req_disks.difference(rsp_disks):
auth.post(
''.join([
"https://compute.googleapis.com/compute/v1/",
"projects/{project}/zones/{zone}/instances/{name}/attachDisk"]).format(**module.params),
{u'source': d},
)
def label_fingerprint_update(module, request, response): def label_fingerprint_update(module, request, response):
auth = GcpSession(module, 'compute') auth = GcpSession(module, 'compute')
auth.post( auth.post(
@ -1375,7 +1402,7 @@ def response_to_hash(module, response):
u'cpuPlatform': response.get(u'cpuPlatform'), u'cpuPlatform': response.get(u'cpuPlatform'),
u'creationTimestamp': response.get(u'creationTimestamp'), u'creationTimestamp': response.get(u'creationTimestamp'),
u'deletionProtection': response.get(u'deletionProtection'), u'deletionProtection': response.get(u'deletionProtection'),
u'disks': InstanceDisksArray(module.params.get('disks', []), module).to_request(), u'disks': InstanceDisksArray(response.get('disks', []), module).from_response(),
u'guestAccelerators': InstanceGuestacceleratorsArray(response.get(u'guestAccelerators', []), module).from_response(), u'guestAccelerators': InstanceGuestacceleratorsArray(response.get(u'guestAccelerators', []), module).from_response(),
u'hostname': response.get(u'hostname'), u'hostname': response.get(u'hostname'),
u'id': response.get(u'id'), u'id': response.get(u'id'),