openstack/fuel-library
Code Issues Proposed changes

Merge "Fix keystone URLs in noop tests"

Browse Source
This commit is contained in:
Jenkins 2016-03-17 13:55:08 +00:00 committed by Gerrit Code Review
commit 8ae2d6c485
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/noop/spec/hosts/ceph/radosgw_spec.rb
View File

@ -83,11 +83,11 @@ describe manifest do
it {
if Noop.hiera('external_lb', false)
url = internal_url
url = "#{internal_url}/v3"
provider = 'http'
else
url = 'http://' + Noop.hiera('service_endpoint').to_s + ':10000/;csv'
provider = Puppet::Type.type(:haproxy_backend_status).defaultprovider.name
provider = Puppet::Type.type(:haproxy_backend_status).defaultprovider.name
end
should contain_haproxy_backend_status('keystone-public').with(
:url => url,
@ -97,7 +97,7 @@ describe manifest do
it {
if Noop.hiera('external_lb', false)
url = admin_url
url = "#{admin_url}/v3"
provider = 'http'
else
url = 'http://' + Noop.hiera('service_endpoint').to_s + ':10000/;csv'

2
tests/noop/spec/hosts/heat/heat_spec.rb
View File

@ -155,7 +155,7 @@ describe manifest do
"Class[heat::keystone::domain]")
end
if Noop.hiera('external_lb', false)
url = "#{admin_auth_protocol}://#{admin_auth_address}:35357/"
url = "#{admin_auth_protocol}://#{admin_auth_address}:35357/v3"
provider = 'http'
else
url = 'http://' + Noop.hiera('service_endpoint').to_s + ':10000/;csv'