stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[spec] Fix cloud::image specs (refs: #81)

Browse Source 
Thanks « el Grand matador » !
This commit is contained in:
Sebastien Badia 2014-02-21 14:20:58 +01:00
parent 8e61232d09
commit 5748ec1c95
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spec/classes/cloud_image_spec.rb
View File

@ -41,7 +41,8 @@ describe 'cloud::image' do
} }
end end
shared_examples_for 'a glance api server' do shared_examples_for 'openstack image' do
it 'configure glance-api' do it 'configure glance-api' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:sql_connection => 'mysql://glance:secrete@10.0.0.1/glance', :sql_connection => 'mysql://glance:secrete@10.0.0.1/glance',
@ -60,9 +61,7 @@ describe 'cloud::image' do
:use_syslog => true :use_syslog => true
) )
end end
end
shared_examples_for 'a glance registry server' do
it 'configure glance-registry' do it 'configure glance-registry' do
should contain_class('glance::registry').with( should contain_class('glance::registry').with(
:sql_connection => 'mysql://glance:secrete@10.0.0.1/glance', :sql_connection => 'mysql://glance:secrete@10.0.0.1/glance',
@ -78,19 +77,6 @@ describe 'cloud::image' do
:use_syslog => true :use_syslog => true
) )
end end
end
shared_examples_for 'openstack image' do
context 'configure glance-api' do
before { params.merge!(:show_image_direct_url => true)}
it_configures 'a glance api server'
end
context 'configure glance-registry' do
before { params.delete(:show_image_direct_url) }
it_configures 'a glance registry server'
end
# TODO(EmilienM) Disabled for now # TODO(EmilienM) Disabled for now
# Follow-up https://github.com/enovance/puppet-cloud/issues/160 # Follow-up https://github.com/enovance/puppet-cloud/issues/160