From 18eb1e6c24956c7a34ab9e81cc2e31f50ceee8f0 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Tue, 24 Feb 2015 13:56:50 -0600
Subject: [PATCH] swift missing auth tenant

And swift does not use oslo logging, so clean that up

Change-Id: I83937823ab1aa4d2f387efbf9bcf174c046c7799
---
 attributes/default.rb | 7 +------
 spec/logging_spec.rb  | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 2506d128..9620b588 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -374,7 +374,7 @@ default['openstack']['endpoints']['object-storage-api-bind']['bind_interface'] =
 default['openstack']['endpoints']['object-storage-api']['host'] = node['openstack']['endpoints']['host']
 default['openstack']['endpoints']['object-storage-api']['scheme'] = 'http'
 default['openstack']['endpoints']['object-storage-api']['port'] = '8080'
-default['openstack']['endpoints']['object-storage-api']['path'] = '/v1/'
+default['openstack']['endpoints']['object-storage-api']['path'] = '/v1/AUTH_%(tenant_id)s'
 default['openstack']['endpoints']['object-storage-api']['bind_interface'] = nil
 
 # ******************** OpenStack Metering Endpoints ***************************
@@ -514,11 +514,6 @@ default['openstack']['logging']['loggers'] = {
     'handlers' => 'prod,debug',
     'qualname' => 'neutron'
   },
-  'swift' => {
-    'level' => 'DEBUG',
-    'handlers' => 'prod,debug',
-    'qualname' => 'swift'
-  },
   'trove' => {
     'level' => 'DEBUG',
     'handlers' => 'prod,debug',
diff --git a/spec/logging_spec.rb b/spec/logging_spec.rb
index 436f232a..a24773b1 100644
--- a/spec/logging_spec.rb
+++ b/spec/logging_spec.rb
@@ -71,7 +71,7 @@ describe 'openstack-common::logging' do
             'loggers' =>
               [
                 'keys=root,ceilometer,cinder,glance,horizon,keystone,nova,'\
-                'neutron,swift,trove,amqplib,sqlalchemy,boto,suds,eventletwsgi,'\
+                'neutron,trove,amqplib,sqlalchemy,boto,suds,eventletwsgi,'\
                 'nova_api_openstack_wsgi,nova_osapi_compute_wsgi_server'
               ],
             'logger_root' =>
@@ -121,12 +121,6 @@ describe 'openstack-common::logging' do
                 'handlers=prod,debug',
                 'qualname=neutron'
               ],
-            'logger_swift' =>
-              [
-                'level=DEBUG',
-                'handlers=prod,debug',
-                'qualname=swift'
-              ],
             'logger_trove' =>
               [
                 'level=DEBUG',