volume/iscsi: Fix typo and use real default iscsi_helper in tests

sbadia · richm · commit b5b45a2eec88 · 2014-08-13T20:43:34.000Z
The default value for iscsi_helper isn't correctly configured in volume::iscsi. This commit fix also a typo in the params class. Closes-Bug: 1341091 Change-Id: Idcad78c78405c17518b8f4fe75e9954107b386f9 (cherry picked from commit 0e076de)
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -49,7 +49,7 @@
         }
       }
       default: {
-        $Iscsi_helper = 'tgtadm'
+        $iscsi_helper = 'tgtadm'
       }
     }
 
diff --git a/manifests/volume/iscsi.pp b/manifests/volume/iscsi.pp
@@ -2,9 +2,11 @@
 class cinder::volume::iscsi (
   $iscsi_ip_address,
   $volume_group      = 'cinder-volumes',
-  $iscsi_helper      = $cinder::params::iscsi_helper,
+  $iscsi_helper      = $::cinder::params::iscsi_helper,
 ) {
 
+  include cinder::params
+
   cinder::backend::iscsi { 'DEFAULT':
     iscsi_ip_address   => $iscsi_ip_address,
     volume_group       => $volume_group,
diff --git a/spec/classes/cinder_volume_iscsi_spec.rb b/spec/classes/cinder_volume_iscsi_spec.rb
@@ -2,10 +2,8 @@
 
 describe 'cinder::volume::iscsi' do
 
-  let :req_params do {
-    :iscsi_ip_address => '127.0.0.2',
-    :iscsi_helper => 'tgtadm'
-  }
+  let :req_params do
+    {:iscsi_ip_address => '127.0.0.2'}
   end
 
   let :facts do
@@ -18,18 +16,22 @@
       req_params
     end
 
-    it { should contain_cinder_config('DEFAULT/iscsi_ip_address').with(
-      :value => '127.0.0.2'
-    ) }
-    it { should contain_cinder_config('DEFAULT/iscsi_helper').with(
-      :value => 'tgtadm'
-    ) }
-    it { should contain_cinder_config('DEFAULT/volume_group').with(
-      :value => 'cinder-volumes'
-    ) }
+    it { should contain_cinder_config('DEFAULT/iscsi_ip_address').with(:value => '127.0.0.2')}
+    it { should contain_cinder_config('DEFAULT/iscsi_helper').with(:value => 'tgtadm')}
+    it { should contain_cinder_config('DEFAULT/volume_group').with(:value => 'cinder-volumes')}
 
   end
 
+  describe 'with a unsupported iscsi helper' do
+    let(:params) { req_params.merge(:iscsi_helper => 'fooboozoo')}
+
+    it 'should raise an error' do
+      expect {
+        should compile
+      }.to raise_error Puppet::Error, /Unsupported iscsi helper: fooboozoo/
+    end
+  end
+
   describe 'with RedHat' do
 
     let :params do

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`default: {`
`52`		`- $Iscsi_helper = 'tgtadm'`
	`52`	`+ $iscsi_helper = 'tgtadm'`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`