Merge pull request #73 from enovance/bug/72/emilien
compute/hypervisor: drop iscsi commands
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user