* Add parameter hooks to inventory plugin iocage. * Add changelog fragment. * Update plugins/inventory/iocage.py Co-authored-by: Felix Fontein <felix@fontein.de> * Parameter renamed to hooks_results * Fix DOCUMENTATION YAML 4-space indentation. * Fix DOCUMENTATION YAML 2-space indentation. * Update changelogs/fragments/9651-iocage-inventory-hooks.yml Co-authored-by: Felix Fontein <felix@fontein.de> * Add note about activated pool mountpoint. --------- Co-authored-by: Felix Fontein <felix@fontein.de>pull/9733/head
parent
7af5e158b8
commit
fdd1331e4a
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- iocage inventory plugin - the new parameter ``hooks_results`` of the plugin is a list of files inside a jail that provide configuration parameters for the inventory. The inventory plugin reads the files from the jails and put the contents into the items of created variable ``iocage_hooks`` (https://github.com/ansible-collections/community.general/issues/9650, https://github.com/ansible-collections/community.general/pull/9651).
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
DOCUMENTATION = '''
|
DOCUMENTATION = r'''
|
||||||
name: iocage
|
name: iocage
|
||||||
short_description: iocage inventory source
|
short_description: iocage inventory source
|
||||||
version_added: 10.2.0
|
version_added: 10.2.0
|
||||||
|
@ -71,6 +71,15 @@ DOCUMENTATION = '''
|
||||||
- Enable O(sudo_preserve_env) if O(sudo) is enabled.
|
- Enable O(sudo_preserve_env) if O(sudo) is enabled.
|
||||||
type: dict
|
type: dict
|
||||||
default: {}
|
default: {}
|
||||||
|
hooks_results:
|
||||||
|
description:
|
||||||
|
- List of paths to the files in a jail.
|
||||||
|
- Content of the files is stored in the items of the list C(iocage_hooks).
|
||||||
|
- If a file is not available the item keeps the dash character C(-).
|
||||||
|
- The variable C(iocage_hooks) is not created if O(hooks_results) is empty.
|
||||||
|
type: list
|
||||||
|
elements: path
|
||||||
|
version_added: 10.4.0
|
||||||
notes:
|
notes:
|
||||||
- You might want to test the command C(ssh user@host iocage list -l) on
|
- You might want to test the command C(ssh user@host iocage list -l) on
|
||||||
the controller before using this inventory plugin with O(user) specified
|
the controller before using this inventory plugin with O(user) specified
|
||||||
|
@ -82,9 +91,14 @@ DOCUMENTATION = '''
|
||||||
command C(iocage list -l).
|
command C(iocage list -l).
|
||||||
- The names of these variables correspond to the output columns.
|
- The names of these variables correspond to the output columns.
|
||||||
- The column C(NAME) is used to name the added host.
|
- The column C(NAME) is used to name the added host.
|
||||||
|
- The option O(hooks_results) expects the C(poolname) of a jail is mounted to
|
||||||
|
C(/poolname). For example, if you activate the pool C(iocage) this plugin
|
||||||
|
expects to find the O(hooks_results) items in the path
|
||||||
|
C(/iocage/iocage/jails/<name>/root). If you mount the C(poolname) to a
|
||||||
|
different path the easiest remedy is to create a symlink.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
EXAMPLES = '''
|
EXAMPLES = r'''
|
||||||
---
|
---
|
||||||
# file name must end with iocage.yaml or iocage.yml
|
# file name must end with iocage.yaml or iocage.yml
|
||||||
plugin: community.general.iocage
|
plugin: community.general.iocage
|
||||||
|
@ -142,6 +156,18 @@ keyed_groups:
|
||||||
key: iocage_release
|
key: iocage_release
|
||||||
- prefix: state
|
- prefix: state
|
||||||
key: iocage_state
|
key: iocage_state
|
||||||
|
|
||||||
|
---
|
||||||
|
# Read the file /var/db/dhclient-hook.address.epair0b in the jails and use it as ansible_host
|
||||||
|
plugin: community.general.iocage
|
||||||
|
host: 10.1.0.73
|
||||||
|
user: admin
|
||||||
|
hooks_results:
|
||||||
|
- /var/db/dhclient-hook.address.epair0b
|
||||||
|
compose:
|
||||||
|
ansible_host: iocage_hooks.0
|
||||||
|
groups:
|
||||||
|
test: inventory_hostname.startswith('test')
|
||||||
'''
|
'''
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
@ -226,6 +252,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
sudo_preserve_env = self.get_option('sudo_preserve_env')
|
sudo_preserve_env = self.get_option('sudo_preserve_env')
|
||||||
env = self.get_option('env')
|
env = self.get_option('env')
|
||||||
get_properties = self.get_option('get_properties')
|
get_properties = self.get_option('get_properties')
|
||||||
|
hooks_results = self.get_option('hooks_results')
|
||||||
|
|
||||||
cmd = []
|
cmd = []
|
||||||
my_env = os.environ.copy()
|
my_env = os.environ.copy()
|
||||||
|
@ -286,6 +313,50 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
|
|
||||||
self.get_properties(t_stdout, results, hostname)
|
self.get_properties(t_stdout, results, hostname)
|
||||||
|
|
||||||
|
if hooks_results:
|
||||||
|
cmd_get_pool = cmd.copy()
|
||||||
|
cmd_get_pool.append(self.IOCAGE)
|
||||||
|
cmd_get_pool.append('get')
|
||||||
|
cmd_get_pool.append('--pool')
|
||||||
|
try:
|
||||||
|
p = Popen(cmd_get_pool, stdout=PIPE, stderr=PIPE, env=my_env)
|
||||||
|
stdout, stderr = p.communicate()
|
||||||
|
if p.returncode != 0:
|
||||||
|
raise AnsibleError(
|
||||||
|
f'Failed to run cmd={cmd_get_pool}, rc={p.returncode}, stderr={to_native(stderr)}')
|
||||||
|
try:
|
||||||
|
iocage_pool = to_text(stdout, errors='surrogate_or_strict').strip()
|
||||||
|
except UnicodeError as e:
|
||||||
|
raise AnsibleError(f'Invalid (non unicode) input returned: {e}') from e
|
||||||
|
except Exception as e:
|
||||||
|
raise AnsibleError(f'Failed to get pool: {e}') from e
|
||||||
|
|
||||||
|
for hostname, host_vars in results['_meta']['hostvars'].items():
|
||||||
|
iocage_hooks = []
|
||||||
|
for hook in hooks_results:
|
||||||
|
path = "/" + iocage_pool + "/iocage/jails/" + hostname + "/root" + hook
|
||||||
|
cmd_cat_hook = cmd.copy()
|
||||||
|
cmd_cat_hook.append('cat')
|
||||||
|
cmd_cat_hook.append(path)
|
||||||
|
try:
|
||||||
|
p = Popen(cmd_cat_hook, stdout=PIPE, stderr=PIPE, env=my_env)
|
||||||
|
stdout, stderr = p.communicate()
|
||||||
|
if p.returncode != 0:
|
||||||
|
iocage_hooks.append('-')
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
iocage_hook = to_text(stdout, errors='surrogate_or_strict').strip()
|
||||||
|
except UnicodeError as e:
|
||||||
|
raise AnsibleError(f'Invalid (non unicode) input returned: {e}') from e
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
iocage_hooks.append('-')
|
||||||
|
else:
|
||||||
|
iocage_hooks.append(iocage_hook)
|
||||||
|
|
||||||
|
results['_meta']['hostvars'][hostname]['iocage_hooks'] = iocage_hooks
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|
||||||
def get_jails(self, t_stdout, results):
|
def get_jails(self, t_stdout, results):
|
||||||
|
|
Loading…
Reference in New Issue