Skip to content

Commit

Permalink
fix spec test failures.
Browse files Browse the repository at this point in the history
This commit resolves spec test failures.

- adds create_resources to fixtures for 2.6 tests
- updates endpoints for new format
  • Loading branch information
Dan Bode committed Oct 26, 2012
1 parent 10b57ad commit b57e071
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
1 change: 1 addition & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ fixtures:
"sysctl": "git://github.com/duritong/puppet-sysctl.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:
"nova": "#{source_dir}"
18 changes: 6 additions & 12 deletions spec/classes/nova_keystone_endpoint_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,22 @@
:description => 'EC2 Service'
)}

it { should contain_keystone_endpoint('nova').with(
it { should contain_keystone_endpoint('RegionOne/nova').with(
:ensure => 'present',
:region => 'RegionOne',
:public_url => 'http://127.0.0.1:8774/v2/%(tenant_id)s',
:admin_url => 'http://127.0.0.1:8774/v2/%(tenant_id)s',
:internal_url => 'http://127.0.0.1:8774/v2/%(tenant_id)s'
)}

it { should contain_keystone_endpoint('nova_volume').with(
it { should contain_keystone_endpoint('RegionOne/nova_volume').with(
:ensure => 'present',
:region => 'RegionOne',
:public_url => 'http://127.0.0.1:8776/v1/%(tenant_id)s',
:admin_url => 'http://127.0.0.1:8776/v1/%(tenant_id)s',
:internal_url => 'http://127.0.0.1:8776/v1/%(tenant_id)s'
)}

it { should contain_keystone_endpoint('nova_ec2').with(
it { should contain_keystone_endpoint('RegionOne/nova_ec2').with(
:ensure => 'present',
:region => 'RegionOne',
:public_url => 'http://127.0.0.1:8773/services/Cloud',
:admin_url => 'http://127.0.0.1:8773/services/Admin',
:internal_url => 'http://127.0.0.1:8773/services/Cloud'
Expand Down Expand Up @@ -129,25 +126,22 @@
}
end

it { should contain_keystone_endpoint('nova').with(
it { should contain_keystone_endpoint('RegionTwo/nova').with(
:ensure => 'present',
:region => 'RegionTwo',
:public_url => 'http://10.0.0.1:9774/v2.2/%(tenant_id)s',
:admin_url => 'http://10.0.0.2:9774/v2.2/%(tenant_id)s',
:internal_url => 'http://10.0.0.3:9774/v2.2/%(tenant_id)s'
)}

it { should contain_keystone_endpoint('nova_volume').with(
it { should contain_keystone_endpoint('RegionTwo/nova_volume').with(
:ensure => 'present',
:region => 'RegionTwo',
:public_url => 'http://10.0.0.1:9776/v2.1/%(tenant_id)s',
:admin_url => 'http://10.0.0.2:9776/v2.1/%(tenant_id)s',
:internal_url => 'http://10.0.0.3:9776/v2.1/%(tenant_id)s'
)}

it { should contain_keystone_endpoint('nova_ec2').with(
it { should contain_keystone_endpoint('RegionTwo/nova_ec2').with(
:ensure => 'present',
:region => 'RegionTwo',
:public_url => 'http://10.0.0.1:9773/services/Cloud',
:admin_url => 'http://10.0.0.2:9773/services/Admin',
:internal_url => 'http://10.0.0.3:9773/services/Cloud'
Expand Down

0 comments on commit b57e071

Please sign in to comment.