openstack
/
fuel-library
Code Issues Proposed changes

Merge "Specify API version in Keystone url"

This commit is contained in:
Jenkins 2016-03-29 12:06:29 +00:00 committed by Gerrit Code Review
parent 934ee65415 3962d9d0a2
commit 2527e5dea6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
View File

@ -39,7 +39,7 @@ class openstack_tasks::ceilometer::compute {
$admin_auth_endpoint = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', [$service_endpoint])
$keystone_identity_uri = "${admin_auth_protocol}://${admin_auth_endpoint}:35357/"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/v2.0"
if ($ceilometer_enabled) {

2
deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
View File

@ -44,7 +44,7 @@ class openstack_tasks::ceilometer::controller {
$internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http')
$internal_auth_endpoint = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint])
$keystone_identity_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:35357/"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/v2.0"
prepare_network_config(hiera_hash('network_scheme', {}))
$api_bind_address = get_network_role_property('ceilometer/api', 'ipaddr')

2
tests/noop/spec/hosts/ceilometer/compute_spec.rb
View File

@ -30,7 +30,7 @@ describe manifest do
admin_auth_endpoint = Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','admin','hostname',[service_endpoint]
keystone_identity_uri = "#{admin_auth_protocol}://#{admin_auth_endpoint}:35357/"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/v2.0"
kombu_compression = Noop.hiera 'kombu_compression', ''
if ceilometer_hash['enabled']

2
tests/noop/spec/hosts/ceilometer/controller_spec.rb
View File

@ -54,7 +54,7 @@ describe manifest do
internal_auth_protocol = Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','internal','protocol','http'
internal_auth_endpoint = Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','internal','hostname',[service_endpoint]
keystone_identity_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:35357/"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/v2.0"
kombu_compression = Noop.hiera 'kombu_compression', ''
# Ceilometer