mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Allow the Openstack dynamic inventory to discover ansible_user (#17944)
This commit is contained in:
parent
089226e372
commit
bb9c6694a7
1 changed files with 8 additions and 0 deletions
|
@ -47,6 +47,9 @@
|
||||||
# has failed (for example, bad credentials or being offline).
|
# has failed (for example, bad credentials or being offline).
|
||||||
# When set to False, the inventory will return hosts from
|
# When set to False, the inventory will return hosts from
|
||||||
# whichever other clouds it can contact. (Default: True)
|
# whichever other clouds it can contact. (Default: True)
|
||||||
|
#
|
||||||
|
# Also it is possible to pass the correct user by setting an ansible_user: $myuser
|
||||||
|
# metadata attribute.
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import collections
|
import collections
|
||||||
|
@ -126,6 +129,11 @@ def append_hostvars(hostvars, groups, key, server, namegroup=False):
|
||||||
ansible_ssh_host=server['interface_ip'],
|
ansible_ssh_host=server['interface_ip'],
|
||||||
ansible_host=server['interface_ip'],
|
ansible_host=server['interface_ip'],
|
||||||
openstack=server)
|
openstack=server)
|
||||||
|
|
||||||
|
metadata = server.get('metadata', {})
|
||||||
|
if 'ansible_user' in metadata:
|
||||||
|
hostvars[key]['ansible_user'] = metadata['ansible_user']
|
||||||
|
|
||||||
for group in get_groups_from_server(server, namegroup=namegroup):
|
for group in get_groups_from_server(server, namegroup=namegroup):
|
||||||
groups[group].append(key)
|
groups[group].append(key)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue