Refactor iscsi initiator-name reset into separate profile
This currently assumes nova-compute and iscsid run in the same context which isn't true for a containerized deployment Change-Id: I91f1ce7625c351745dbadd84b565d55598ea5b59
This commit is contained in:
parent
ec9aea34c7
commit
fb10b8ec5b
45
manifests/profile/base/iscsid.pp
Normal file
45
manifests/profile/base/iscsid.pp
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
# Copyright 2016 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
#
|
||||||
|
# == Class: tripleo::profile::base::iscsid
|
||||||
|
#
|
||||||
|
# Nova Compute profile for tripleo
|
||||||
|
#
|
||||||
|
# === Parameters
|
||||||
|
#
|
||||||
|
# [*step*]
|
||||||
|
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||||
|
# for more details.
|
||||||
|
# Defaults to hiera('step')
|
||||||
|
#
|
||||||
|
class tripleo::profile::base::iscsid (
|
||||||
|
$step = Integer(hiera('step')),
|
||||||
|
) {
|
||||||
|
|
||||||
|
if $step >= 2 {
|
||||||
|
# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1244328
|
||||||
|
ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' })
|
||||||
|
exec { 'reset-iscsi-initiator-name':
|
||||||
|
command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
|
||||||
|
onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
|
||||||
|
before => File['/etc/iscsi/.initiator_reset'],
|
||||||
|
require => Package['iscsi-initiator-utils'],
|
||||||
|
tag => 'iscsid_config'
|
||||||
|
}
|
||||||
|
file { '/etc/iscsi/.initiator_reset':
|
||||||
|
ensure => present,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -45,19 +45,6 @@ class tripleo::profile::base::nova::compute (
|
|||||||
|
|
||||||
# deploy bits to connect nova compute to neutron
|
# deploy bits to connect nova compute to neutron
|
||||||
include ::nova::network::neutron
|
include ::nova::network::neutron
|
||||||
|
|
||||||
# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1244328
|
|
||||||
ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' })
|
|
||||||
exec { 'reset-iscsi-initiator-name':
|
|
||||||
command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
|
|
||||||
onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
|
|
||||||
before => File['/etc/iscsi/.initiator_reset'],
|
|
||||||
require => Package['iscsi-initiator-utils'],
|
|
||||||
}
|
|
||||||
file { '/etc/iscsi/.initiator_reset':
|
|
||||||
ensure => present,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# If NFS is used as a Cinder backend
|
# If NFS is used as a Cinder backend
|
||||||
|
42
spec/classes/tripleo_profile_base_iscsid_spec.rb
Normal file
42
spec/classes/tripleo_profile_base_iscsid_spec.rb
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
#
|
||||||
|
# Copyright (C) 2017 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe 'tripleo::profile::base::iscsid' do
|
||||||
|
shared_examples_for 'tripleo::profile::base::iscsid' do
|
||||||
|
context 'default params' do
|
||||||
|
let(:params) { { :step => 2, } }
|
||||||
|
|
||||||
|
it {
|
||||||
|
is_expected.to contain_package('iscsi-initiator-utils')
|
||||||
|
is_expected.to contain_exec('reset-iscsi-initiator-name')
|
||||||
|
is_expected.to contain_file('/etc/iscsi/.initiator_reset')
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
on_supported_os.each do |os, facts|
|
||||||
|
context "on #{os}" do
|
||||||
|
let(:facts) do
|
||||||
|
facts.merge({ :hostname => 'node.example.com' })
|
||||||
|
end
|
||||||
|
|
||||||
|
it_behaves_like 'tripleo::profile::base::iscsid'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -27,9 +27,6 @@ describe 'tripleo::profile::base::nova::compute' do
|
|||||||
is_expected.to_not contain_class('tripleo::profile::base::nova')
|
is_expected.to_not contain_class('tripleo::profile::base::nova')
|
||||||
is_expected.to_not contain_class('nova::compute')
|
is_expected.to_not contain_class('nova::compute')
|
||||||
is_expected.to_not contain_class('nova::network::neutron')
|
is_expected.to_not contain_class('nova::network::neutron')
|
||||||
is_expected.to_not contain_package('iscsi-initiator-utils')
|
|
||||||
is_expected.to_not contain_exec('reset-iscsi-initiator-name')
|
|
||||||
is_expected.to_not contain_file('/etc/iscsi/.initiator_reset')
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -52,9 +49,6 @@ eos
|
|||||||
is_expected.to contain_class('tripleo::profile::base::nova')
|
is_expected.to contain_class('tripleo::profile::base::nova')
|
||||||
is_expected.to contain_class('nova::compute')
|
is_expected.to contain_class('nova::compute')
|
||||||
is_expected.to contain_class('nova::network::neutron')
|
is_expected.to contain_class('nova::network::neutron')
|
||||||
is_expected.to contain_package('iscsi-initiator-utils')
|
|
||||||
is_expected.to contain_exec('reset-iscsi-initiator-name')
|
|
||||||
is_expected.to contain_file('/etc/iscsi/.initiator_reset')
|
|
||||||
is_expected.to_not contain_package('nfs-utils')
|
is_expected.to_not contain_package('nfs-utils')
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@ -68,9 +62,6 @@ eos
|
|||||||
is_expected.to contain_class('tripleo::profile::base::nova')
|
is_expected.to contain_class('tripleo::profile::base::nova')
|
||||||
is_expected.to contain_class('nova::compute')
|
is_expected.to contain_class('nova::compute')
|
||||||
is_expected.to contain_class('nova::network::neutron')
|
is_expected.to contain_class('nova::network::neutron')
|
||||||
is_expected.to contain_package('iscsi-initiator-utils')
|
|
||||||
is_expected.to contain_exec('reset-iscsi-initiator-name')
|
|
||||||
is_expected.to contain_file('/etc/iscsi/.initiator_reset')
|
|
||||||
is_expected.to contain_package('nfs-utils')
|
is_expected.to contain_package('nfs-utils')
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user