diff options
author | Jan Klare <j.klare@cloudbau.de> | 2018-04-05 16:30:31 +0200 |
---|---|---|
committer | Jan Klare <j.klare@cloudbau.de> | 2018-04-05 16:30:31 +0200 |
commit | 607fd77784557a7ebf689092201abfb14109ce51 (patch) | |
tree | e4125d9edeb919232326862c2b964c482a995d2e /spec | |
parent | 6a083d4ab003a41369b15bf7222b032231226ea0 (diff) |
remove all ceph related attributes and specs
Change-Id: I24b1a8f8e735e50de535e191cb6cfca489923c25
Notes
Notes (review):
Code-Review+2: Samuel Cassiba <s@cassiba.com>
Workflow+1: Christoph Albers <c.albers@x-ion.de>
Verified+2: Zuul
Submitted-by: Zuul
Submitted-at: Mon, 09 Apr 2018 15:37:34 +0000
Reviewed-on: https://review.openstack.org/559101
Project: openstack/cookbook-openstack-block-storage
Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/cinder_common_spec.rb | 6 | ||||
-rw-r--r-- | spec/spec_helper.rb | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb index fc43260..6e06650 100644 --- a/spec/cinder_common_spec.rb +++ b/spec/cinder_common_spec.rb | |||
@@ -164,12 +164,6 @@ describe 'openstack-block-storage::cinder-common' do | |||
164 | end | 164 | end |
165 | end | 165 | end |
166 | 166 | ||
167 | context 'rbd attributes' do | ||
168 | before do | ||
169 | node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.rbd.RBDDriver' | ||
170 | end | ||
171 | end | ||
172 | |||
173 | context 'netapp ISCSI settings' do | 167 | context 'netapp ISCSI settings' do |
174 | before do | 168 | before do |
175 | node.set['openstack']['block-storage']['conf']['DEFAULT']['volume_driver'] = 'cinder.volume.drivers.netapp.NetAppISCSIDriver' | 169 | node.set['openstack']['block-storage']['conf']['DEFAULT']['volume_driver'] = 'cinder.volume.drivers.netapp.NetAppISCSIDriver' |
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cb91497..1e774ca 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb | |||
@@ -32,9 +32,6 @@ shared_context 'block-storage-stubs' do | |||
32 | .with('db', anything) | 32 | .with('db', anything) |
33 | .and_return('') | 33 | .and_return('') |
34 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | 34 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) |
35 | .with('token', 'rbd_secret_uuid') | ||
36 | .and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad') | ||
37 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | ||
38 | .with('token', 'openstack_vmware_secret_name') | 35 | .with('token', 'openstack_vmware_secret_name') |
39 | .and_return 'vmware_secret_name' | 36 | .and_return 'vmware_secret_name' |
40 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | 37 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) |
@@ -47,9 +44,6 @@ shared_context 'block-storage-stubs' do | |||
47 | .with('service', 'openstack-block-storage') | 44 | .with('service', 'openstack-block-storage') |
48 | .and_return('cinder-pass') | 45 | .and_return('cinder-pass') |
49 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | 46 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) |
50 | .with('service', 'openstack_image_cephx_key') | ||
51 | .and_return('cephx-key') | ||
52 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | ||
53 | .with('user', 'admin') | 47 | .with('user', 'admin') |
54 | .and_return('emc_test_pass') | 48 | .and_return('emc_test_pass') |
55 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) | 49 | allow_any_instance_of(Chef::Recipe).to receive(:get_password) |