openstack
/
puppet-glance
Code Issues Proposed changes

Merge pull request #54 from bodepd/create_resource_fixtures 

fix test failures
This commit is contained in:
Dan Bode 2012-10-26 12:17:17 -07:00
parent 43a83bd2cd f7b905a639
commit adc2b9319b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.fixtures.yml
View File

@ -6,5 +6,6 @@ fixtures:
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
"rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
'inifile': 'git://github.com/cprice-puppet/puppetlabs-inifile'
"create_resources": 'git://github.com/puppetlabs/puppetlabs-create_resources'
symlinks:
"glance": "#{source_dir}"

6
spec/classes/glance_keystone_auth_spec.rb
View File

@ -24,9 +24,8 @@ describe 'glance::keystone::auth' do
:description => 'Openstack Image Service'
) }
it { should contain_keystone_endpoint('glance').with(
it { should contain_keystone_endpoint('RegionOne/glance').with(
:ensure => 'present',
:region => 'RegionOne',
:public_url => 'http://127.0.0.1:9292/v1',
:admin_url => 'http://127.0.0.1:9292/v1',
:internal_url => 'http://127.0.0.1:9292/v1'
@ -75,9 +74,8 @@ describe 'glance::keystone::auth' do
}
end
it { should contain_keystone_endpoint('glance').with(
it { should contain_keystone_endpoint('RegionTwo/glance').with(
:ensure => 'present',
:region => 'RegionTwo',
:public_url => 'http://10.0.0.1:9393/v1',
:admin_url => 'http://10.0.0.2:9393/v1',
:internal_url => 'http://10.0.0.3:9393/v1'