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

Use dashes not underscores for linode labels. (#44719)

Browse source 
This is because underscores are illegals in hostnames and users might
want to create the same host names are the name of the Linode machine
(as in the report in #30059).

Closes https://github.com/ansible/ansible/issues/30059.
This commit is contained in:
lwm 2018-09-20 21:42:45 +02:00 committed by Brian Coca
parent 4774ea7a15
commit 0947948d6b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/linode/linode.py
View file

@ -29,7 +29,7 @@ options:
name: name:
description: description:
- Name to give the instance (alphanumeric, dashes, underscore). - Name to give the instance (alphanumeric, dashes, underscore).
- To keep sanity on the Linode Web Console, name is prepended with C(LinodeID_). - To keep sanity on the Linode Web Console, name is prepended with C(LinodeID-).
required: true required: true
displaygroup: displaygroup:
description: description:
@ -367,7 +367,7 @@ def linodeServers(module, api, state, name,
PaymentTerm=payment_term) PaymentTerm=payment_term)
linode_id = res['LinodeID'] linode_id = res['LinodeID']
# Update linode Label to match name # Update linode Label to match name
api.linode_update(LinodeId=linode_id, Label='%s_%s' % (linode_id, name)) api.linode_update(LinodeId=linode_id, Label='%s-%s' % (linode_id, name))
# Update Linode with Ansible configuration options # Update Linode with Ansible configuration options
api.linode_update(LinodeId=linode_id, LPM_DISPLAYGROUP=displaygroup, WATCHDOG=watchdog, **kwargs) api.linode_update(LinodeId=linode_id, LPM_DISPLAYGROUP=displaygroup, WATCHDOG=watchdog, **kwargs)
# Save server # Save server