From fdd823af63f269e291aab892050389d5b5682dcf Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 28 Jan 2014 00:58:07 +0100 Subject: [PATCH] compute/hypervisor: drop iscsi commands 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 --- manifests/compute/hypervisor.pp | 8 -------- spec/classes/cloud_compute_hypervisor_spec.rb | 5 ----- 2 files changed, 13 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index f0c6de4a..66f7fd23 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -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 { diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 92cd8e2c..e2fa88b2 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -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,