From 7f87e86a33d07882f814dfd7a197b14271efb3c7 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 10 Jan 2014 11:41:05 +0100 Subject: [PATCH] volume/controller: change backup driver to ceph Signed-off-by: Emilien Macchi --- manifests/volume/controller.pp | 10 +++++----- spec/classes/privatecloud_volume_controller_spec.rb | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index 82ec7e02..0cdb7038 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -20,11 +20,10 @@ class privatecloud::volume::controller( $ks_cinder_internal_port = $os_params::ks_cinder_internal_port, $ks_cinder_password = $os_params::ks_cinder_password, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_swift_internal_proto = $os_params::ks_swift_internal_proto, - $ks_swift_internal_host = $os_params::ks_swift_internal_host, - $ks_swift_internal_port = $os_params::ks_swift_internal_port, $ks_glance_internal_host = $os_params::ks_glance_internal_host, $api_eth = $os_params::api_eth, + $backup_ceph_pool = 'ceph_backup_cinder', + $backup_ceph_user = 'cinder' ) { include 'privatecloud::volume' @@ -39,8 +38,9 @@ class privatecloud::volume::controller( class { 'cinder::backup': } - class { 'cinder::backup::swift': - backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH" + class { 'cinder::backup::ceph': + backup_ceph_user => $backup_ceph_user, + backup_ceph_pool => $backup_ceph_pool } class { 'cinder::glance': diff --git a/spec/classes/privatecloud_volume_controller_spec.rb b/spec/classes/privatecloud_volume_controller_spec.rb index 9aefa73b..7b94a0d4 100644 --- a/spec/classes/privatecloud_volume_controller_spec.rb +++ b/spec/classes/privatecloud_volume_controller_spec.rb @@ -40,9 +40,8 @@ describe 'privatecloud::volume::controller' do :ks_cinder_internal_port => '8776', :ks_keystone_internal_host => '10.0.0.1', :ks_glance_internal_host => '10.0.0.1', - :ks_swift_internal_port => '8080', - :ks_swift_internal_host => '10.0.0.1', - :ks_swift_internal_proto => 'http', + :backup_ceph_user => 'cinder', + :backup_ceph_pool => 'ceph_backup_cinder', :api_eth => '10.0.0.1' } end @@ -81,10 +80,11 @@ describe 'privatecloud::volume::controller' do ) end - it 'configure cinder backup using swift backend' do + it 'configure cinder backup using ceph backend' do should contain_class('cinder::backup') - should contain_class('cinder::backup::swift').with( - :backup_swift_url => 'http://10.0.0.1:8080/v1/AUTH', + should contain_class('cinder::backup::ceph').with( + :backup_ceph_user => 'cinder', + :backup_ceph_pool => 'ceph_backup_cinder' ) end