From 5af106c4f37e742d95e5da76adb14021eed73c6f Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 28 Jan 2014 12:25:48 +0100 Subject: [PATCH] Fix Re-arrange variable declaration with glance/ceph Refs: GH-80 (GH-82) and openstack-puppet-ci-#23 Closes: GH-84 --- manifests/image.pp | 5 ++--- spec/classes/cloud_image_spec.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/image.pp b/manifests/image.pp index 128adf26..c777eb20 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -66,8 +66,8 @@ class cloud::image( $rabbit_password = $os_params::rabbit_password, $rabbit_host = $os_params::rabbit_hosts[0], $api_eth = $os_params::api_eth, - $rbd_store_pool = 'ceph_glance', - $rbd_store_user = 'glance', + $rbd_store_pool = $os_params::glance_rbd_pool, + $rbd_store_user = $os_params::glance_rbd_user, $verbose = $os_params::verbose, $debug = $os_params::debug ) { @@ -94,7 +94,6 @@ class cloud::image( rabbit_host => $rabbit_host, } - # TODO(EmilienM) We should migrate the backend to Ceph (WIP). For now, I let Swift. class { 'glance::backend::rbd': rbd_store_user => $rbd_store_user, rbd_store_pool => $rbd_store_pool diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 61ca874d..486ec54c 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::image' do :rabbit_host => '10.0.0.1', :rabbit_password => 'secrete', :rbd_store_user => 'glance', - :rbd_store_pool => 'ceph_glance', + :rbd_store_pool => 'images', :debug => true, :verbose => true, :api_eth => '10.0.0.1' }