Fixing inconsistent auth_token middleware

* Version bump to 7.0.5

addresses: bug #1207504

Change-Id: I5b0360369fa18772c7a488458e271678f465ca8f
This commit is contained in:
Justin Shepherd 2013-11-05 23:24:27 -05:00 committed by galstrom21
parent 6ba0451ca2
commit dc89aea2de
6 changed files with 34 additions and 4 deletions

View File

@ -2,6 +2,11 @@ openstack-metering Cookbook CHANGELOG
==============================
This file is used to list changes made in each version of the openstack-metering cookbook.
v7.0.5
------
### Bug
- Corrected inconsistent keystone middleware auth_token for ceilometer.conf.erb.
v7.0.4
------
### Bug

View File

@ -63,9 +63,11 @@ License and Author
|:---------------------|:---------------------------------------------------|
| **Author** | Matt Ray (<matt@opscode.com>) |
| **Author** | John Dewey (<jdewey@att.com>) |
| **Author** | Justin Shepherd (<jshepher@rackspace.com>) |
| | |
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
| **Copyright** | Copyright (c) 2013, AT&T Services, Inc. |
| **Copyright** | Copyright (c) 2013, Rackspace US, Inc. |
Licensed under the Apache License, Version 2.0 (the "License");

View File

@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com"
license "Apache 2.0"
description "The OpenStack Metering service Ceilometer."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "7.0.4"
version "7.0.5"
recipe "openstack-metering::agent-central", "Installs agent central service."
recipe "openstack-metering::agent-compute", "Installs agent compute service."

View File

@ -45,6 +45,7 @@ service_pass = service_password "openstack-compute"
service_tenant = node["openstack"]["metering"]["service_tenant_name"]
identity_endpoint = endpoint "identity-api"
identity_admin_endpoint = endpoint "identity-admin"
image_endpoint = endpoint "image-api"
Chef::Log.debug("openstack-metering::common:service_user|#{service_user}")
@ -70,6 +71,7 @@ template node["openstack"]["metering"]["conf"] do
:database_connection => db_uri,
:image_endpoint => image_endpoint,
:identity_endpoint => identity_endpoint,
:identity_admin_endpoint => identity_admin_endpoint,
:rabbit_pass => rabbit_pass,
:service_pass => service_pass,
:service_tenant_name => service_tenant,

View File

@ -69,6 +69,26 @@ describe "openstack-metering::common" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_virtual_host = /"
end
it "has auth_uri" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_uri = http://127.0.0.1:5000/v2.0"
end
it "has auth_host" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_host = 127.0.0.1"
end
it "has auth_port" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_port = 35357"
end
it "has auth_protocol" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_protocol = http"
end
end
describe "/etc/ceilometer/policy.json" do

View File

@ -27,9 +27,10 @@ periodic_interval = <%= node["openstack"]["metering"]["periodic_interval"] %>
[keystone_authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = <%= @identity_endpoint.host %>
auth_port = <%= @identity_endpoint.port %>
auth_protocol = <%= @identity_endpoint.scheme %>
auth_uri = <%= @identity_endpoint.to_s %>
auth_host = <%= @identity_admin_endpoint.host %>
auth_port = <%= @identity_admin_endpoint.port %>
auth_protocol = <%= @identity_admin_endpoint.scheme %>
admin_tenant_name = <%= @service_tenant_name %>
admin_user = <%= @service_user %>
admin_password = <%= @service_pass %>