From 4cfe21d5c9bc6a53ae74d7bf687a67118d7795b7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 14 Mar 2024 12:29:08 +0900 Subject: [PATCH] Use creates property of exec ... instead of unless + test command, to leverage the built-in feature and simplify the logic in our own modules. Change-Id: Id9b6bc78f225ddca2ce9580b38a02351c2fbdd35 --- manifests/iscsid.pp | 2 +- spec/classes/openstacklib_iscsid_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/iscsid.pp b/manifests/iscsid.pp index 6f6b7a0a..c4d727d4 100644 --- a/manifests/iscsid.pp +++ b/manifests/iscsid.pp @@ -35,7 +35,7 @@ class openstacklib::iscsid( exec { 'create-initiatorname-file': command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi', path => ['/usr/bin','/usr/sbin','/bin','/usr/bin'], - unless => 'test -e /etc/iscsi/initiatorname.iscsi', + creates => '/etc/iscsi/initiatorname.iscsi', require => Package['open-iscsi'], } diff --git a/spec/classes/openstacklib_iscsid_spec.rb b/spec/classes/openstacklib_iscsid_spec.rb index 2d6bb102..42fff324 100644 --- a/spec/classes/openstacklib_iscsid_spec.rb +++ b/spec/classes/openstacklib_iscsid_spec.rb @@ -12,7 +12,7 @@ describe 'openstacklib::iscsid' do it { is_expected.to contain_exec('create-initiatorname-file').with({ :command => 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi', :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]')} it { is_expected.to contain_service('iscsid').with(