Merge remote-tracking branch 'origin/devel' into digitalocean-user-data
Conflicts: cloud/digital_ocean/digital_ocean.py
This commit is contained in:
commit
360409cee8
5 changed files with 5 additions and 2 deletions
|
@ -116,7 +116,7 @@ options:
|
||||||
version_added: "1.8"
|
version_added: "1.8"
|
||||||
wait_for_instances:
|
wait_for_instances:
|
||||||
description:
|
description:
|
||||||
- Wait for the ASG instances to be in a ready state before exiting. If instances are behind an ELB, it will wait until the instances are considered by the ELB.
|
- Wait for the ASG instances to be in a ready state before exiting. If instances are behind an ELB, it will wait until the ELB determines all instances have a lifecycle_state of "InService" and a health_status of "Healthy".
|
||||||
version_added: "1.9"
|
version_added: "1.9"
|
||||||
default: yes
|
default: yes
|
||||||
required: False
|
required: False
|
||||||
|
|
|
@ -99,6 +99,7 @@ options:
|
||||||
|
|
||||||
notes:
|
notes:
|
||||||
- Two environment variables can be used, DO_API_KEY and DO_API_TOKEN. They both refer to the v2 token.
|
- Two environment variables can be used, DO_API_KEY and DO_API_TOKEN. They both refer to the v2 token.
|
||||||
|
- Version 2 of DigitalOcean API is used.
|
||||||
requirements: [ dopy ]
|
requirements: [ dopy ]
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ options:
|
||||||
|
|
||||||
notes:
|
notes:
|
||||||
- Two environment variables can be used, DO_CLIENT_ID and DO_API_KEY.
|
- Two environment variables can be used, DO_CLIENT_ID and DO_API_KEY.
|
||||||
|
- Version 1 of DigitalOcean API is used.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ options:
|
||||||
|
|
||||||
notes:
|
notes:
|
||||||
- Two environment variables can be used, DO_CLIENT_ID and DO_API_KEY.
|
- Two environment variables can be used, DO_CLIENT_ID and DO_API_KEY.
|
||||||
|
- Version 1 of DigitalOcean API is used.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -342,7 +342,7 @@ def main():
|
||||||
|
|
||||||
d['pw_name'] = pw.pw_name
|
d['pw_name'] = pw.pw_name
|
||||||
|
|
||||||
grp_info = grp.getgrgid(pw.pw_gid)
|
grp_info = grp.getgrgid(st.st_gid)
|
||||||
d['gr_name'] = grp_info.gr_name
|
d['gr_name'] = grp_info.gr_name
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
Loading…
Reference in a new issue