summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMark Vanderwiel <vanderwl@us.ibm.com>2015-05-05 13:29:08 -0500
committerMark Vanderwiel <vanderwl@us.ibm.com>2015-05-06 16:05:55 +0000
commitc9f1018d9bac666fa4dabefd74caa62317f8db09 (patch)
tree807ce2580fe14b74f304414ab2a6ccc614c761a0 /spec
parentcb7a11a2c42c9a2a133b2f33d2cc1ddf0b1f3b2a (diff)
Add host id to cinder default section
Cinder volumes are associated with the cinder host that created them. This unique host id can be changed in the conf file. This patch adds support to allow that. Change-Id: I9295ed1bfa24bfac8325bd347a92b5e334a31371 Closes-Bug: #1451967
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Jay Bryant <jsbryant@us.ibm.com> Code-Review+2: Jan Klare <j.klare@x-ion.de> Workflow+1: JJ Asghar <jj@getchef.com> Submitted-by: Jenkins Submitted-at: Fri, 08 May 2015 15:52:54 +0000 Reviewed-on: https://review.openstack.org/180264 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
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 8ed5454..5ffe9b6 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
@@ -196,6 +196,10 @@ describe 'openstack-block-storage::cinder-common' do
196 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lib/cinder/lock$)) 196 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lib/cinder/lock$))
197 end 197 end
198 198
199 it 'does not have unique host id by default' do
200 expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^host=/)
201 end
202
199 context 'netapp driver' do 203 context 'netapp driver' do
200 # FIXME(galstrom21): this block needs to check all of the default 204 # FIXME(galstrom21): this block needs to check all of the default
201 # netapp_* configuration options 205 # netapp_* configuration options