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
This commit is contained in:
		@@ -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'],
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user