From ededd0aa35775cf997987b298b10c340486f0cf1 Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Wed, 25 May 2016 17:55:30 +0300
Subject: [PATCH] Set versionless auth_url for ceilometer

Change-Id: Icc71136e0eda16cd7fdba1a448d750b1e6fe40a3
Depends-on: d82c232b5e7c782803844826fde9f4242dd6437f
Closes-bug: #1583554
---
 .../puppet/openstack_tasks/manifests/ceilometer/compute.pp      | 2 +-
 .../puppet/openstack_tasks/manifests/ceilometer/controller.pp   | 2 +-
 tests/noop/spec/hosts/ceilometer/compute_spec.rb                | 2 +-
 tests/noop/spec/hosts/ceilometer/controller_spec.rb             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
index 7832b0f75e..6c7a2dd9a8 100644
--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
+++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
@@ -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) {
 
diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
index 5e5b2fdd00..54751fb735 100644
--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
+++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
@@ -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/"
 
 #as $ssl default value in ceilometer::wsgi::apache is true and
 #we use SSL at HAproxy, but not the API host we should set 'false'
diff --git a/tests/noop/spec/hosts/ceilometer/compute_spec.rb b/tests/noop/spec/hosts/ceilometer/compute_spec.rb
index 92c482a99b..f47558274e 100644
--- a/tests/noop/spec/hosts/ceilometer/compute_spec.rb
+++ b/tests/noop/spec/hosts/ceilometer/compute_spec.rb
@@ -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']
diff --git a/tests/noop/spec/hosts/ceilometer/controller_spec.rb b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
index 2e22c67079..5732682e00 100644
--- a/tests/noop/spec/hosts/ceilometer/controller_spec.rb
+++ b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
@@ -51,7 +51,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', ''
 
     ssl = 'false'