openstack/puppet-openstacklib
Code Issues Proposed changes

Use creates property of exec

Browse Source 
... instead of unless + test command, to leverage the built-in feature
and simplify the logic in our own modules.

Change-Id: Id9b6bc78f225ddca2ce9580b38a02351c2fbdd35
This commit is contained in:
Takashi Kajinami
2024-03-14 12:29:08 +09:00
parent 04e35709a7
commit 4cfe21d5c9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/iscsid.pp
View File

@@ -35,7 +35,7 @@ class openstacklib::iscsid(
exec { 'create-initiatorname-file': exec { 'create-initiatorname-file':
command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi', command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi',
path => ['/usr/bin','/usr/sbin','/bin','/usr/bin'], path => ['/usr/bin','/usr/sbin','/bin','/usr/bin'],
unless => 'test -e /etc/iscsi/initiatorname.iscsi', creates => '/etc/iscsi/initiatorname.iscsi',
require => Package['open-iscsi'], require => Package['open-iscsi'],
} }

2
spec/classes/openstacklib_iscsid_spec.rb
View File

@@ -12,7 +12,7 @@ describe 'openstacklib::iscsid' do
it { is_expected.to contain_exec('create-initiatorname-file').with({ it { is_expected.to contain_exec('create-initiatorname-file').with({
:command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi', :command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi',
:path => ['/usr/bin','/usr/sbin','/bin','/usr/bin'], :path => ['/usr/bin','/usr/sbin','/bin','/usr/bin'],
:unless => 'test -e /etc/iscsi/initiatorname.iscsi', :creates => '/etc/iscsi/initiatorname.iscsi',
}).that_requires('Package[open-iscsi]')} }).that_requires('Package[open-iscsi]')}
it { is_expected.to contain_service('iscsid').with( it { is_expected.to contain_service('iscsid').with(