Set versionless auth_url for ceilometer

Change-Id: Icc71136e0eda16cd7fdba1a448d750b1e6fe40a3
Depends-on: d82c232b5e7c782803844826fde9f4242dd6437f
Closes-bug: #1583554
(cherry picked from commit ededd0aa35)
This commit is contained in:
iberezovskiy 2016-05-25 17:55:30 +03:00 committed by Ivan Berezovskiy
parent aad8945f76
commit a481def664
4 changed files with 4 additions and 4 deletions

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/v2.0"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/"
if ($ceilometer_enabled) {

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/v2.0"
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/"
prepare_network_config(hiera_hash('network_scheme', {}))
$api_bind_address = get_network_role_property('ceilometer/api', 'ipaddr')

View File

@ -23,7 +23,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/v2.0"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/"
kombu_compression = Noop.hiera 'kombu_compression', ''
if ceilometer_hash['enabled']

View File

@ -48,7 +48,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/v2.0"
keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/"
kombu_compression = Noop.hiera 'kombu_compression', ''
# Ceilometer