diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-05-08 15:00:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-05-08 15:00:12 +0000 |
commit | 2b8f7f71b03806024b63c82bb2fef7dbfe593b8b (patch) | |
tree | 76999b6f7a5bdaee6872c334740995bbf7fe3f65 /spec | |
parent | 12d1c1ab83707aa0eac3e072e5a7a45bc2349f3c (diff) | |
parent | 2ea252646d96ab7d1ce738ec627142740494967f (diff) |
Merge "Make enable v1 and v2 api option configurable"
Diffstat (limited to 'spec')
-rw-r--r-- | spec/cinder_common_spec.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb index c92f09c..d6d175f 100644 --- a/spec/cinder_common_spec.rb +++ b/spec/cinder_common_spec.rb | |||
@@ -341,8 +341,17 @@ describe 'openstack-block-storage::cinder-common' do | |||
341 | end | 341 | end |
342 | 342 | ||
343 | it 'has default api version set' do | 343 | it 'has default api version set' do |
344 | [/^enable_v1_api=false$/, | 344 | [/^enable_v1_api=False$/, |
345 | /^enable_v2_api=true$/].each do |line| | 345 | /^enable_v2_api=True$/].each do |line| |
346 | expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line) | ||
347 | end | ||
348 | end | ||
349 | |||
350 | it 'has override api version set' do | ||
351 | node.set['openstack']['block-storage']['enable_v1_api'] = 'True' | ||
352 | node.set['openstack']['block-storage']['enable_v2_api'] = 'False' | ||
353 | [/^enable_v1_api=True$/, | ||
354 | /^enable_v2_api=False$/].each do |line| | ||
346 | expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line) | 355 | expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line) |
347 | end | 356 | end |
348 | end | 357 | end |