summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-08 15:52:54 +0000
committerGerrit Code Review <review@openstack.org>2015-05-08 15:52:54 +0000
commit6a8e987f424449647e2bdd72909a46c95cc2efb2 (patch)
treeb84aa0cf90ad3580d4fce934553be709052d9362 /spec
parent2b8f7f71b03806024b63c82bb2fef7dbfe593b8b (diff)
parentc9f1018d9bac666fa4dabefd74caa62317f8db09 (diff)
Merge "Add host id to cinder default section"
Diffstat (limited to 'spec')
-rw-r--r--spec/cinder_common_spec.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index d6d175f..6166433 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -167,7 +167,7 @@ describe 'openstack-block-storage::cinder-common' do
167 context 'template contents' do 167 context 'template contents' do
168 168
169 context 'commonly named attributes' do 169 context 'commonly named attributes' do
170 %w(debug verbose notification_driver 170 %w(debug verbose host notification_driver
171 storage_availability_zone quota_volumes quota_gigabytes quota_driver 171 storage_availability_zone quota_volumes quota_gigabytes quota_driver
172 volume_name_template snapshot_name_template osapi_volume_workers 172 volume_name_template snapshot_name_template osapi_volume_workers
173 use_default_quota_class quota_snapshots no_snapshot_gb_quota 173 use_default_quota_class quota_snapshots no_snapshot_gb_quota
@@ -175,7 +175,7 @@ describe 'openstack-block-storage::cinder-common' do
175 it "has a #{attr_key} attribute" do 175 it "has a #{attr_key} attribute" do
176 node.set['openstack']['block-storage'][attr_key] = "#{attr_key}_value" 176 node.set['openstack']['block-storage'][attr_key] = "#{attr_key}_value"
177 177
178 expect(chef_run).to render_file(file.name).with_content(/^#{attr_key}=#{attr_key}_value$/) 178 expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^#{attr_key}=#{attr_key}_value$/)
179 end 179 end
180 end 180 end
181 end 181 end
@@ -240,6 +240,10 @@ describe 'openstack-block-storage::cinder-common' do
240 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lib/cinder/lock$)) 240 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lib/cinder/lock$))
241 end 241 end
242 242
243 it 'does not have unique host id by default' do
244 expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^host=/)
245 end
246
243 context 'netapp driver' do 247 context 'netapp driver' do
244 # FIXME(galstrom21): this block needs to check all of the default 248 # FIXME(galstrom21): this block needs to check all of the default
245 # netapp_* configuration options 249 # netapp_* configuration options