stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #73 from enovance/bug/72/emilien

Browse Source 
compute/hypervisor: drop iscsi commands
This commit is contained in:
Gonéri Le Bouder
2014-01-28 01:53:15 -08:00
parent 19a953d159 fdd823af63
commit b266b88c5b
2 changed files with 0 additions and 13 deletions
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, 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': } class { 'nova::compute::neutron': }
if $has_ceph { 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"') should contain_exec('/sbin/modprobe nbd').with('unless' => '/bin/grep -q "^nbd " "/proc/modules"')
end 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 it 'configure nova-compute' do
should contain_class('nova::compute').with( should contain_class('nova::compute').with(
:enabled => true, :enabled => true,