openstack/fuel-library
Code Issues Proposed changes

Specify API version in Keystone url

Browse Source 
For now Ceilometer working with API v2.0 by
default. There are issues to migrate on third API
version quickly, but with current configuration
"ceilometer-polling" doesn't work.

Change-Id: I250ba35e2612f8367b77265b4982cb2cb675dcdf
Closes-bug: #1560089
This commit is contained in:
dmburmistrov 2016-03-25 16:35:28 +03:00 committed by Dmitry Burmistrov
parent cecbfd839b
commit 3962d9d0a2
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

@ -20,7 +20,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

@ -45,7 +45,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