stackforge/puppet-openstack-cloud
Code Issues Proposed changes

compute/hypervisor: drop iscsi commands

Browse Source 
Since we use Ceph as default backend, we don't need iscsi anymore for
now.
That could be enabled again in the future when we will support
multiple backends, but it's not the case now.

Close #72

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-28 00:58:07 +01:00
parent 12f1cd30e7
commit fdd823af63
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute/hypervisor.pp
View File

@ -95,14 +95,6 @@ Host *
migration_support => true,
}
exec{'/etc/init.d/open-iscsi start':
onlyif => '/bin/grep "GenerateName=yes" /etc/iscsi/initiatorname.iscsi'
}
exec{'/etc/init.d/open-iscsi stop':
subscribe => Exec['/etc/init.d/open-iscsi start'],
refreshonly => true
}
class { 'nova::compute::neutron': }
if $has_ceph {

5
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -64,11 +64,6 @@ describe 'cloud::compute::hypervisor' do
should contain_exec('/sbin/modprobe nbd').with('unless' => '/bin/grep -q "^nbd " "/proc/modules"')
end
it 'start and stop isci service' do
should contain_exec('/etc/init.d/open-iscsi start').with('onlyif' => '/bin/grep "GenerateName=yes" /etc/iscsi/initiatorname.iscsi')
should contain_exec('/etc/init.d/open-iscsi stop').with('refreshonly' => true)
end
it 'configure nova-compute' do
should contain_class('nova::compute').with(
:enabled => true,