From 6366bb9f08628a1db8b2e8d05a2b6ddc135a71ed Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Tue, 5 Aug 2014 14:05:53 -0500
Subject: [PATCH] Update ceilometer conf files for Juno

* Update conf
  - remove paste filter, handled in paste.ini
* Update specs as needed

Change-Id: Ie275475490caec0ab1d08b7f39dc195b269b7592
Closes-Bug: #1353047
---
 CHANGELOG.md                          |  1 +
 spec/spec_helper.rb                   | 16 ++++++++--------
 templates/default/ceilometer.conf.erb |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe3224e..f091e66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This file is used to list changes made in each version of the openstack-metering
 
 ## 10.0.1
 * Support vmware hypervisor
+* Sync conf files with Juno
 
 ## 10.0.0
 * Upgrading to Juno
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f85095b..3328895 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -25,26 +25,26 @@ UBUNTU_OPTS = {
 
 shared_context 'telemetry-stubs' do
   before do
-    Chef::Recipe.any_instance.stub(:memcached_servers).and_return([])
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:memcached_servers).and_return([])
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('db', anything)
       .and_return('')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'openstack-ceilometer')
       .and_return('ceilometer-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'guest')
       .and_return('mq-pass')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_identity_bootstrap_token')
       .and_return('bootstrap-token')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_metering_secret')
       .and_return('metering_secret')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_vmware_secret_name')
       .and_return 'vmware_secret_name'
-    Chef::Application.stub(:fatal!)
+    allow(Chef::Application).to receive(:fatal!)
   end
 end
 
diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb
index cfb8191..fa51e69 100644
--- a/templates/default/ceilometer.conf.erb
+++ b/templates/default/ceilometer.conf.erb
@@ -62,7 +62,6 @@ host = <%= @api_bind_host %>
 port = <%= @api_bind_port %>
 
 [keystone_authtoken]
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 auth_uri = <%= @auth_uri %>
 auth_host = <%= @identity_admin_endpoint.host %>
 auth_port = <%= @identity_admin_endpoint.port %>