openstack
/
cookbook-openstack-common
Code Issues Proposed changes

Merge "swift missing auth tenant"

This commit is contained in:
Jenkins 2015-02-26 22:32:51 +00:00 committed by Gerrit Code Review
parent 09e8cc9ad7 18eb1e6c24
commit 6e9beb4a1c
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
attributes/default.rb
View File

@ -385,7 +385,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 ***************************
@ -525,11 +525,6 @@ default['openstack']['logging']['loggers'] = {
'handlers' => 'prod,debug',
'qualname' => 'neutron'
},
'swift' => {
'level' => 'DEBUG',
'handlers' => 'prod,debug',
'qualname' => 'swift'
},
'trove' => {
'level' => 'DEBUG',
'handlers' => 'prod,debug',

8
spec/logging_spec.rb
View File

@ -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',