Browse Source

Use updated volume packages for Cinder

- scsi-target-utils comes from EPEL. Now that EPEL is disabled, this is removed
  in favor of targetcli from the base repo. This is also available for Ubuntu to
  provide a consistent outcome.

Change-Id: Ibc146350ef2ddd1d19e35402cbf69e036a759f1d
Implements: blueprint modern-chef
Samuel Cassiba 1 year ago
parent
commit
2e17c9a922
3 changed files with 7 additions and 7 deletions
  1. 3
    3
      attributes/default.rb
  2. 1
    1
      recipes/volume.rb
  3. 3
    3
      spec/volume_spec.rb

+ 3
- 3
attributes/default.rb View File

@@ -89,14 +89,14 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
89 89
     'cinder_common_packages' => ['openstack-cinder'],
90 90
     'cinder_api_packages' => ['openstack-cinder'],
91 91
     'cinder_api_service' => 'openstack-cinder-api',
92
-    'cinder_volume_packages' => ['qemu-img-ev', 'scsi-target-utils'],
92
+    'cinder_volume_packages' => ['qemu-img-ev'],
93 93
     'cinder_volume_service' => 'openstack-cinder-volume',
94 94
     'cinder_scheduler_packages' => [],
95 95
     'cinder_scheduler_service' => 'openstack-cinder-scheduler',
96 96
     'cinder_backup_packages' => [],
97 97
     'cinder_backup_service' => 'openstack-cinder-backup',
98 98
     'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
99
-    'cinder_iscsitarget_service' => 'tgtd',
99
+    'cinder_iscsitarget_service' => 'target',
100 100
     'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
101 101
     'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
102 102
     'cinder_emc_packages' => ['pywbem'],
@@ -118,7 +118,7 @@ when 'debian'
118 118
     'cinder_backup_packages' => ['cinder-backup'],
119 119
     'cinder_backup_service' => 'cinder-backup',
120 120
     'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
121
-    'cinder_iscsitarget_packages' => ['tgt'],
121
+    'cinder_iscsitarget_packages' => ['targetcli'],
122 122
     'cinder_iscsitarget_service' => 'tgt',
123 123
     'cinder_nfs_packages' => ['nfs-common'],
124 124
     'cinder_emc_packages' => ['python-pywbem'],

+ 1
- 1
recipes/volume.rb View File

@@ -65,7 +65,7 @@ service 'iscsitarget' do
65 65
   action :enable
66 66
 end
67 67
 
68
-template '/etc/tgt/targets.conf' do
68
+template '/etc/target/targets.conf' do
69 69
   source 'targets.conf.erb'
70 70
   mode 0o0600
71 71
   notifies :restart, 'service[iscsitarget]', :immediately

+ 3
- 3
spec/volume_spec.rb View File

@@ -35,7 +35,7 @@ describe 'openstack-block-storage::volume' do
35 35
     end
36 36
 
37 37
     it 'starts iscsi target on boot' do
38
-      expect(chef_run).to enable_service 'tgt'
38
+      expect(chef_run).to enable_service 'iscsitarget'
39 39
     end
40 40
 
41 41
     it 'upgrades mysql python packages by default' do
@@ -43,11 +43,11 @@ describe 'openstack-block-storage::volume' do
43 43
     end
44 44
 
45 45
     it 'upgrades cinder iscsi package' do
46
-      expect(chef_run).to upgrade_package 'tgt'
46
+      expect(chef_run).to upgrade_package 'targetcli'
47 47
     end
48 48
 
49 49
     describe 'targets.conf' do
50
-      let(:file) { chef_run.template('/etc/tgt/targets.conf') }
50
+      let(:file) { chef_run.template('/etc/target/targets.conf') }
51 51
 
52 52
       it 'should create the targets.conf' do
53 53
         expect(chef_run).to create_template(file.name).with(

Loading…
Cancel
Save