From 1bf55a9f36e1ab876f487b26f2d93e7186f8eeaf Mon Sep 17 00:00:00 2001
From: Xingchao Yu <yuxcer@gmail.com>
Date: Wed, 26 Apr 2017 11:31:36 +0800
Subject: [PATCH] Add parameter add_ports in ironic-inspector

Change-Id: I86afd850c6a747974f56eb84bf1c965c02881e33
---
 manifests/inspector.pp                                    | 8 ++++++++
 ...d-inspector-parameters-add_ports-a254b910883edb08.yaml | 3 +++
 spec/classes/ironic_inspector_spec.rb                     | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/add-inspector-parameters-add_ports-a254b910883edb08.yaml

diff --git a/manifests/inspector.pp b/manifests/inspector.pp
index 89333c9e..65359e1d 100644
--- a/manifests/inspector.pp
+++ b/manifests/inspector.pp
@@ -55,6 +55,11 @@
 #   (optional) Location to store logs retrieved from the ramdisk
 #   Defaults to '/var/log/ironic-inspector/ramdisk/'
 #
+# [*add_ports*]
+#   (optional)  Which MAC addresses to add as ports during introspection.
+#   Allowed values: all, active, pxe.
+#   Defaults to $::os_service_default
+#
 # [*keep_ports*]
 #   (optional) Which ports to keep after introspection
 #   Defaults to 'all'
@@ -203,6 +208,7 @@
 # [*dnsmasq_ip_range*]
 #   (optional) IP range to use for nodes being introspected
 #   Defaults to undef
+#
 class ironic::inspector (
   $package_ensure                  = 'present',
   $enabled                         = true,
@@ -213,6 +219,7 @@ class ironic::inspector (
   $dnsmasq_interface               = 'br-ctlplane',
   $db_connection                   = undef,
   $ramdisk_logs_dir                = '/var/log/ironic-inspector/ramdisk/',
+  $add_ports                       = $::os_service_default,
   $keep_ports                      = 'all',
   $store_data                      = 'none',
   $ironic_auth_type                = 'password',
@@ -336,6 +343,7 @@ tftpboot and httpboot setup, please include ::ironic::pxe")
     'firewall/dnsmasq_interface':                 value => $dnsmasq_interface;
     'processing/ramdisk_logs_dir':                value => $ramdisk_logs_dir;
     'processing/enable_setting_ipmi_credentials': value => $enable_setting_ipmi_credentials;
+    'processing/add_ports':                       value => $add_ports;
     'processing/keep_ports':                      value => $keep_ports;
     'processing/store_data':                      value => $store_data;
     'ironic/auth_type':                           value => $ironic_auth_type;
diff --git a/releasenotes/notes/add-inspector-parameters-add_ports-a254b910883edb08.yaml b/releasenotes/notes/add-inspector-parameters-add_ports-a254b910883edb08.yaml
new file mode 100644
index 00000000..7d43ce5b
--- /dev/null
+++ b/releasenotes/notes/add-inspector-parameters-add_ports-a254b910883edb08.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add add_ports parameter in ironic-inspector service.
diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb
index 9d61bd2f..29ead0d5 100644
--- a/spec/classes/ironic_inspector_spec.rb
+++ b/spec/classes/ironic_inspector_spec.rb
@@ -32,6 +32,7 @@ describe 'ironic::inspector' do
       :auth_strategy         => 'keystone',
       :dnsmasq_interface     => 'br-ctlplane',
       :ramdisk_logs_dir      => '/var/log/ironic-inspector/ramdisk/',
+      :add_ports             => 'pxe',
       :keep_ports            => 'all',
       :store_data            => 'none',
       :ironic_auth_type      => 'password',
@@ -104,6 +105,7 @@ describe 'ironic::inspector' do
       is_expected.to contain_ironic_inspector_config('firewall/dnsmasq_interface').with_value(p[:dnsmasq_interface])
       is_expected.to contain_ironic_inspector_config('processing/ramdisk_logs_dir').with_value(p[:ramdisk_logs_dir])
       is_expected.to contain_ironic_inspector_config('processing/enable_setting_ipmi_credentials').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value(p[:add_ports])
       is_expected.to contain_ironic_inspector_config('processing/keep_ports').with_value(p[:keep_ports])
       is_expected.to contain_ironic_inspector_config('processing/store_data').with_value(p[:store_data])
       is_expected.to contain_ironic_inspector_config('ironic/auth_type').with_value(p[:ironic_auth_type])
@@ -191,6 +193,7 @@ describe 'ironic::inspector' do
           :discovery_default_driver    => 'pxe_ipmitool',
           :dnsmasq_ip_subnets          => [],
           :dnsmasq_ip_range            => '192.168.0.100,192.168.0.120',
+          :add_ports                   => 'all',
         )
       end
       it 'should replace default parameter with new value' do
@@ -207,6 +210,7 @@ describe 'ironic::inspector' do
         is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value(p[:swift_auth_url])
         is_expected.to contain_ironic_inspector_config('processing/processing_hooks').with_value('$default_processing_hooks,hook1,hook2')
         is_expected.to contain_ironic_inspector_config('processing/node_not_found_hook').with_value('enroll')
+        is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value('all')
         is_expected.to contain_ironic_inspector_config('discovery/enroll_node_driver').with_value('pxe_ipmitool')
       end