openstack/puppet-tripleo
Code Issues Proposed changes

Do not manage pv/vg for cinder iscsi backend

Browse Source 
They are currently created within tripleo-heat-teampltes, so there are
no reasons why we should create it by puppet.

Change-Id: Icd8730aa4d47bb1059321014d5e8b2c5c323976a
(cherry picked from commit b7cb8896ee)
Conflicts:
	manifests/profile/base/cinder/volume/iscsi.pp
This commit is contained in:
Takashi Kajinami 2020-04-15 16:51:44 +09:00 committed by yatinkarel
parent 0776a2fd91
commit 478a5e102d
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/base/cinder/volume/iscsi.pp
View File

@ -52,16 +52,11 @@ class tripleo::profile::base::cinder::volume::iscsi (
$backend_availability_zone = hiera('cinder::backend::iscsi::backend_availability_zone', undef),
$cinder_iscsi_helper = 'tgtadm',
$cinder_iscsi_protocol = 'iscsi',
$cinder_lvm_loop_device_size = '10280',
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {
class { '::cinder::setup_test_volume':
size => join([$cinder_lvm_loop_device_size, 'M']),
}
# NOTE(gfidente): never emit in hieradata:
# key: [ipv6]
# as it will cause hiera parsing errors

7
spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
View File

@ -32,7 +32,6 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to_not contain_class('cinder::setup_test_volume')
is_expected.to_not contain_cinder__backend__iscsi('tripleo_iscsi')
end
end
@ -45,9 +44,6 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
context 'with defaults' do
it 'should trigger complete configuration' do
is_expected.to contain_class('cinder::setup_test_volume').with(
:size => '10280M'
)
is_expected.to contain_cinder__backend__iscsi('tripleo_iscsi').with(
:target_ip_address => '127.0.0.1',
:target_helper => 'tgtadm',
@ -65,9 +61,6 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
})
end
it 'should trigger complete configuration' do
is_expected.to contain_class('cinder::setup_test_volume').with(
:size => '10280M'
)
is_expected.to contain_cinder__backend__iscsi('tripleo_iscsi').with(
:backend_availability_zone => 'my_zone',
:target_ip_address => '[fe80::fc54:ff:fe9e:7846]',