From 3962d9d0a28dd4ea20c80b454410f6fd1154497a Mon Sep 17 00:00:00 2001
From: dmburmistrov <dmburmistrov@mirantis.com>
Date: Fri, 25 Mar 2016 16:35:28 +0300
Subject: [PATCH] Specify API version in Keystone url

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
---
 .../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 8a05f0d708..3d988d9361 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/"
+  $keystone_auth_uri          = "${internal_auth_protocol}://${internal_auth_endpoint}:5000/v2.0"
 
   if ($ceilometer_enabled) {
 
diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
index 5b5e943ec3..c5ba3cfadd 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/"
+  $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')
diff --git a/tests/noop/spec/hosts/ceilometer/compute_spec.rb b/tests/noop/spec/hosts/ceilometer/compute_spec.rb
index 25efefc549..b55ca41e51 100644
--- a/tests/noop/spec/hosts/ceilometer/compute_spec.rb
+++ b/tests/noop/spec/hosts/ceilometer/compute_spec.rb
@@ -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']
diff --git a/tests/noop/spec/hosts/ceilometer/controller_spec.rb b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
index a541f96a4e..119476c409 100644
--- a/tests/noop/spec/hosts/ceilometer/controller_spec.rb
+++ b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
@@ -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