Browse Source

remove all ceph related attributes and specs

Change-Id: I24b1a8f8e735e50de535e191cb6cfca489923c25
Jan Klare 1 year ago
parent
commit
607fd77784
No account linked to committer's email address
3 changed files with 0 additions and 14 deletions
  1. 0
    2
      attributes/default.rb
  2. 0
    6
      spec/cinder_common_spec.rb
  3. 0
    6
      spec/spec_helper.rb

+ 0
- 2
attributes/default.rb View File

@@ -97,7 +97,6 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
97 97
     'cinder_backup_service' => 'openstack-cinder-backup',
98 98
     'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
99 99
     'cinder_iscsitarget_service' => 'target',
100
-    'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
101 100
     'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
102 101
     'cinder_emc_packages' => ['pywbem'],
103 102
     'cinder_svc_packages' => ['sysfsutils'],
@@ -117,7 +116,6 @@ when 'debian'
117 116
     'cinder_scheduler_service' => 'cinder-scheduler',
118 117
     'cinder_backup_packages' => ['cinder-backup'],
119 118
     'cinder_backup_service' => 'cinder-backup',
120
-    'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
121 119
     'cinder_iscsitarget_packages' => ['targetcli'],
122 120
     'cinder_iscsitarget_service' => 'tgt',
123 121
     'cinder_nfs_packages' => ['nfs-common'],

+ 0
- 6
spec/cinder_common_spec.rb View File

@@ -164,12 +164,6 @@ describe 'openstack-block-storage::cinder-common' do
164 164
           end
165 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 167
         context 'netapp ISCSI settings' do
174 168
           before do
175 169
             node.set['openstack']['block-storage']['conf']['DEFAULT']['volume_driver'] = 'cinder.volume.drivers.netapp.NetAppISCSIDriver'

+ 0
- 6
spec/spec_helper.rb View File

@@ -31,9 +31,6 @@ shared_context 'block-storage-stubs' do
31 31
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
32 32
       .with('db', anything)
33 33
       .and_return('')
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 34
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
38 35
       .with('token', 'openstack_vmware_secret_name')
39 36
       .and_return 'vmware_secret_name'
@@ -46,9 +43,6 @@ shared_context 'block-storage-stubs' do
46 43
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
47 44
       .with('service', 'openstack-block-storage')
48 45
       .and_return('cinder-pass')
49
-    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
50
-      .with('service', 'openstack_image_cephx_key')
51
-      .and_return('cephx-key')
52 46
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
53 47
       .with('user', 'admin')
54 48
       .and_return('emc_test_pass')

Loading…
Cancel
Save