From be5ca93a7c2e4932b84074e2fac8a75797789317 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 6 Jan 2022 11:15:35 +0900 Subject: [PATCH] ironic-inspector: Allow arbitrary configurations This change allows arbitrary configurations of inspector.conf, so that users can customize the parameters even if these are not supported by puppet-ironic. Depends-on: https://review.opendev.org/823613 Change-Id: Ibdaf0ce1f0b03de19015bee61ff60cdb9c3b6ba0 --- manifests/profile/base/ironic_inspector.pp | 2 +- .../classes/tripleo_profile_base_ironic_inspector_spec.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp index dcaee16cf..0c90cfb38 100644 --- a/manifests/profile/base/ironic_inspector.pp +++ b/manifests/profile/base/ironic_inspector.pp @@ -83,7 +83,7 @@ class tripleo::profile::base::ironic_inspector ( include ironic::inspector::db include ironic::inspector::pxe_filter include ironic::inspector::pxe_filter::dnsmasq - include ironic::config + include ironic::inspector::config include ironic::inspector::logging } } diff --git a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb index fb7051194..04f570719 100644 --- a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb +++ b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb @@ -35,7 +35,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to_not contain_class('ironic::inspector::db') is_expected.to_not contain_class('ironic::inspector::pxe_filter') is_expected.to_not contain_class('ironic::inspector::pxe_filter::dnsmasq') - is_expected.to_not contain_class('ironic::config') + is_expected.to_not contain_class('ironic::inspector::config') is_expected.to_not contain_class('ironic::inspector::logging') } end @@ -55,7 +55,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to contain_class('ironic::inspector::db') is_expected.to contain_class('ironic::inspector::pxe_filter') is_expected.to contain_class('ironic::inspector::pxe_filter::dnsmasq') - is_expected.to contain_class('ironic::config') + is_expected.to contain_class('ironic::inspector::config') is_expected.to contain_class('ironic::inspector::logging') } end @@ -72,7 +72,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to_not contain_class('ironic::inspector::db') is_expected.to_not contain_class('ironic::inspector::pxe_filter') is_expected.to_not contain_class('ironic::inspector::pxe_filter::dnsmasq') - is_expected.to_not contain_class('ironic::config') + is_expected.to_not contain_class('ironic::inspector::config') is_expected.to_not contain_class('ironic::inspector::logging') } end @@ -92,7 +92,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to contain_class('ironic::inspector::db') is_expected.to contain_class('ironic::inspector::pxe_filter') is_expected.to contain_class('ironic::inspector::pxe_filter::dnsmasq') - is_expected.to contain_class('ironic::config') + is_expected.to contain_class('ironic::inspector::config') is_expected.to contain_class('ironic::inspector::logging') } end