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
This commit is contained in:
Samuel Cassiba 2018-02-08 21:44:50 -08:00
parent 7ff916564d
commit 2e17c9a922
3 changed files with 7 additions and 7 deletions

View File

@ -89,14 +89,14 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
'cinder_common_packages' => ['openstack-cinder'],
'cinder_api_packages' => ['openstack-cinder'],
'cinder_api_service' => 'openstack-cinder-api',
'cinder_volume_packages' => ['qemu-img-ev', 'scsi-target-utils'],
'cinder_volume_packages' => ['qemu-img-ev'],
'cinder_volume_service' => 'openstack-cinder-volume',
'cinder_scheduler_packages' => [],
'cinder_scheduler_service' => 'openstack-cinder-scheduler',
'cinder_backup_packages' => [],
'cinder_backup_service' => 'openstack-cinder-backup',
'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
'cinder_iscsitarget_service' => 'tgtd',
'cinder_iscsitarget_service' => 'target',
'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
'cinder_emc_packages' => ['pywbem'],
@ -118,7 +118,7 @@ when 'debian'
'cinder_backup_packages' => ['cinder-backup'],
'cinder_backup_service' => 'cinder-backup',
'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
'cinder_iscsitarget_packages' => ['tgt'],
'cinder_iscsitarget_packages' => ['targetcli'],
'cinder_iscsitarget_service' => 'tgt',
'cinder_nfs_packages' => ['nfs-common'],
'cinder_emc_packages' => ['python-pywbem'],

View File

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

View File

@ -35,7 +35,7 @@ describe 'openstack-block-storage::volume' do
end
it 'starts iscsi target on boot' do
expect(chef_run).to enable_service 'tgt'
expect(chef_run).to enable_service 'iscsitarget'
end
it 'upgrades mysql python packages by default' do
@ -43,11 +43,11 @@ describe 'openstack-block-storage::volume' do
end
it 'upgrades cinder iscsi package' do
expect(chef_run).to upgrade_package 'tgt'
expect(chef_run).to upgrade_package 'targetcli'
end
describe 'targets.conf' do
let(:file) { chef_run.template('/etc/tgt/targets.conf') }
let(:file) { chef_run.template('/etc/target/targets.conf') }
it 'should create the targets.conf' do
expect(chef_run).to create_template(file.name).with(