From 5137d12335edc579162508070d94d04a086c929b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 29 Jan 2014 17:05:13 +0100 Subject: [PATCH] Include cinder::volume in cloud::volume::storage It's a dependency which was missing to run cinder-volume. Close #116 Signed-off-by: Emilien Macchi --- manifests/volume/storage.pp | 2 ++ spec/classes/cloud_volume_storage_spec.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index f08ad7c0..62d3f613 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -25,6 +25,8 @@ class cloud::volume::storage( include 'cloud::volume' + include 'cinder::volume' + class { 'cinder::volume::rbd': rbd_pool => $cinder_rbd_pool, glance_api_version => $glance_api_version, diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index f93813c5..dc5bde48 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -59,6 +59,9 @@ describe 'cloud::volume::storage' do end it 'configure cinder volume with rbd backend' do + + should include_class('cinder::volume') + should contain_class('cinder::volume::rbd').with( :rbd_pool => 'ceph_cinder', :glance_api_version => '2',