diff options
author | Lan Qi song <lqslan@cn.ibm.com> | 2015-05-07 21:37:59 +0800 |
---|---|---|
committer | Lan Qi song <lqslan@cn.ibm.com> | 2015-05-08 11:15:03 +0800 |
commit | 2ea252646d96ab7d1ce738ec627142740494967f (patch) | |
tree | 53321430fd2c06ff3c85a47a68be4b15a4b9f059 /spec | |
parent | b4ae9f3deca43babcbf93d5dc3c45e5d182eed6f (diff) |
Make enable v1 and v2 api option configurable
Change-Id: I40efdc8c31dc38f214cc300cc68279af1b614089
Closes-Bug: #1452730
Notes
Notes (review):
Verified+2: Jenkins
Workflow+1: Mark Vanderwiel <vanderwl@us.ibm.com>
Code-Review+2: Ma Wen Cheng <wenchma@cn.ibm.com>
Submitted-by: Jenkins
Submitted-at: Fri, 08 May 2015 15:00:12 +0000
Reviewed-on: https://review.openstack.org/180993
Project: stackforge/cookbook-openstack-block-storage
Branch: refs/heads/master
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 |