From c55910d40c454937d4e75e94fbdb17927330f506 Mon Sep 17 00:00:00 2001
From: Bob Fournier <bfournie@redhat.com>
Date: Wed, 15 Feb 2017 10:47:21 -0500
Subject: [PATCH] Install Ironic inspector plugins

This change installs two Ironic inspector plugins.  The ``lldp_basic``
plugin was added to Ironic inspector in Ocata to process LLDP packets
stored in swift (https://review.openstack.org/#/c/406496/).  The
``local_link_connection`` plugin was added in Newton but had not been
installed (https://review.openstack.org/#/c/321082/). It sets the
port_id and switch_id on Ironic ports from LLDP data.

Change-Id: I5c2734e77a16360f9688a0a389211e3882941eb0
---
 .../puppet-stack-config/puppet-stack-config.yaml.template   | 2 +-
 .../notes/inspector-additional-hooks-9a5c8f5aad2bac31.yaml  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/inspector-additional-hooks-9a5c8f5aad2bac31.yaml

diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 074cf9f1c..f8b0ee60c 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -503,7 +503,7 @@ ironic::inspector::dnsmasq_local_ip: {{LOCAL_IP}}
 ironic::inspector::dnsmasq_ip_range: {{INSPECTION_IPRANGE}}
 ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}}
 ironic::inspector::ramdisk_collectors: {{INSPECTION_COLLECTORS}}
-ironic::inspector::additional_processing_hooks: 'extra_hardware'
+ironic::inspector::additional_processing_hooks: 'extra_hardware,lldp_basic,local_link_connection'
 ironic::inspector::ramdisk_kernel_args: {{INSPECTION_KERNEL_ARGS}}
 ironic::inspector::ipxe_timeout: 60
 ironic::inspector::node_not_found_hook: {{INSPECTION_NODE_NOT_FOUND_HOOK}}
diff --git a/releasenotes/notes/inspector-additional-hooks-9a5c8f5aad2bac31.yaml b/releasenotes/notes/inspector-additional-hooks-9a5c8f5aad2bac31.yaml
new file mode 100644
index 000000000..f25eae388
--- /dev/null
+++ b/releasenotes/notes/inspector-additional-hooks-9a5c8f5aad2bac31.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add new plugins for lldp processing (``lldp_basic``) and switch
+    port link information (``local_link_connection``) to
+    ``processing_hooks`` in inspector.conf.