From a23bdd2e8cf806e60610b953e2bd5cd4ac7120d9 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Sat, 1 Apr 2017 09:01:56 +0100 Subject: [PATCH] Allow inspector plugin list to be extended --- ansible/group_vars/all/inspector | 11 +++++++++-- etc/kayobe/inspector.yml | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/all/inspector b/ansible/group_vars/all/inspector index 36f675942..a89296601 100644 --- a/ansible/group_vars/all/inspector +++ b/ansible/group_vars/all/inspector @@ -17,8 +17,8 @@ inspector_ipa_ramdisk_upstream_url: "{{ ipa_images_ramdisk_url }}" # Whether inspector should manage the firewall. inspector_manage_firewall: False -# List of of inspector processing plugins. -inspector_processing_hooks: +# List of of default inspector processing plugins. +inspector_processing_hooks_default: - root_disk_selection - scheduler - validate_interfaces @@ -29,6 +29,13 @@ inspector_processing_hooks: - local_link_connection - lldp_basic +# List of of additional inspector processing plugins. +inspector_processing_hooks_extra: [] + +# List of of additional inspector processing plugins. +inspector_processing_hooks: > + {{ inspector_processing_hooks_default + inspector_processing_hooks_extra }} + # Which MAC addresses to add as ports during introspection. One of 'all', # 'active' or 'pxe'. inspector_port_addition: "all" diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml index bc62ef378..7d5448770 100644 --- a/etc/kayobe/inspector.yml +++ b/etc/kayobe/inspector.yml @@ -17,7 +17,13 @@ # Whether inspector should manage the firewall. #inspector_manage_firewall: -# List of of inspector processing plugins. +# List of of default inspector processing plugins. +#inspector_processing_hooks_default: + +# List of of additional inspector processing plugins. +#inspector_processing_hooks_extra: + +# List of of additional inspector processing plugins. #inspector_processing_hooks: # Which MAC addresses to add as ports during introspection. One of 'all',