From 76a32af7e9d8f8db8d7affaad1e2ad6322e1b1e8 Mon Sep 17 00:00:00 2001 From: "Luis A. Garcia" Date: Fri, 7 Feb 2014 23:48:48 +0000 Subject: [PATCH] Fix metering service endpoint path After installing ceilometer with the metering cookbook, invoking the ceilometer CLI fails because the API base URL used is http://127.0.0.1:8777/v1/v2 which means that the base endpoint path of /v1 is incorrect and it should be simply /. Change-Id: Id65a17a888175c7b2fe2d3171147cedb66921cc9 Partial-Bug: #1277742 --- CHANGELOG.md | 4 ++++ attributes/default.rb | 4 +++- metadata.rb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c77d735b..84649177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This file is used to list changes made in each version of cookbook-openstack-common. +## 8.1.1 +### Bug +* Adjust metering service endpoint path from /v1 to / + ## 8.1.0 ### Blueprint: * yum-cookbook-v3-support: Update this cookbook to be compatible with version 3 of the yum cookbook. diff --git a/attributes/default.rb b/attributes/default.rb index 350ff8a0..36ca484a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -221,7 +221,9 @@ default['openstack']['endpoints']['object-storage-api']['bind_interface'] = nil default['openstack']['endpoints']['metering-api']['host'] = '127.0.0.1' default['openstack']['endpoints']['metering-api']['scheme'] = 'http' default['openstack']['endpoints']['metering-api']['port'] = '8777' -default['openstack']['endpoints']['metering-api']['path'] = '/v1' +# The ceilometer client appends the protocol version to the endpoint URL, +# so the path needs to be empty +default['openstack']['endpoints']['metering-api']['path'] = '' default['openstack']['endpoints']['metering-api']['bind_interface'] = nil # ******************** OpenStack Orchestration Endpoints *************************** diff --git a/metadata.rb b/metadata.rb index 30178cda..a86761eb 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com' license 'Apache 2.0' description 'Common OpenStack attributes, libraries and recipes.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '8.1.0' +version '8.1.1' recipe 'openstack-common', 'Installs/Configures common recipes' recipe 'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'