summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJens Rosenboom <j.rosenboom@x-ion.de>2015-08-18 15:13:12 +0200
committerJens Rosenboom <j.rosenboom@x-ion.de>2015-08-18 15:13:12 +0200
commitea2fbba04a53cc38201a5db92491dc4d45150aac (patch)
treee254aaa9e484802d76258d4d19cc474cddb6b64c /spec
parent7f980745eb103fc2f4f61833a0353cb9fb06045f (diff)
Do not put empty default_volume_type into config
Change I1bb94dc1283e50645e4aece600acc52ae17db56b added the config option default_volume_type with a default value of nil. With this, cinder fails to create volumes unless a type is explicitly specified. So better only write this value into the config file if it is set to some non-nil value. Change-Id: I7de8c6cc5a424b5b5021675d89a5dba71d72dce0
Notes
Notes (review): Verified+2: Jenkins Workflow+1: Mark Vanderwiel <vanderwl@us.ibm.com> Code-Review+2: Jan Klare <j.klare@x-ion.de> Submitted-by: Jenkins Submitted-at: Thu, 20 Aug 2015 02:13:47 +0000 Reviewed-on: https://review.openstack.org/214182 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/cinder_common_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index 08b6025..dacc1e0 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -1052,7 +1052,7 @@ describe 'openstack-block-storage::cinder-common' do
1052 end 1052 end
1053 1053
1054 it 'does not set default_volume_type' do 1054 it 'does not set default_volume_type' do
1055 expect(chef_run).to_not render_file(file.name).with_content(/^default_volume_type=.+$/) 1055 expect(chef_run).to_not render_file(file.name).with_content(/^default_volume_type=.*$/)
1056 end 1056 end
1057 end 1057 end
1058 end 1058 end