← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceilometer/trusty-proposed

« back to all changes in this revision

Viewing changes to ceilometer/objectstore/swift_middleware.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2014-01-23 15:08:11 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20140123150811-1zaismsuyh1hcl8y
Tags: 2014.1~b2-0ubuntu1
https://launchpad.net/bugs/1261101
https://launchpad.net/bugs/1250002
https://launchpad.net/bugs/1224223
[ James Page ]
* d/control: Add python-jsonpath-rw to BD's.
* d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4.
 (LP: #1261101)

[ Chuck Short ]
* New upstream version.
* debian/control, debian/ceilometer-common.install: Split out
  ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their
  own packages. (LP: #1250002)
* debian/ceilometer-agent-central.logrotate,
  debian/ceilometer-agent-compute.logrotate,
  debian/ceilometer-api.logrotate,
  debian/ceilometer-collector.logrotate: Add logrotate files, 
  thanks to Ahmed Rahal. (LP: #1224223)
* Fix typos in upstart files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/objectstore/swift_middleware.py
33
33
# Some optional configuration
34
34
# this allow to publish additional metadata
35
35
metadata_headers = X-TEST
 
36
 
 
37
# Set reseller prefix (defaults to "AUTH_" if not set)
 
38
reseller_prefix = AUTH_
36
39
"""
37
40
 
38
41
from __future__ import absolute_import
82
85
                'ceilometer.transformer',
83
86
            ),
84
87
        )
 
88
        self.reseller_prefix = conf.get('reseller_prefix', 'AUTH_')
 
89
        if self.reseller_prefix and self.reseller_prefix[-1] != '_':
 
90
            self.reseller_prefix += '_'
85
91
 
86
92
    def __call__(self, env, start_response):
87
93
        start_response_args = [None]
147
153
                    volume=bytes_received,
148
154
                    user_id=env.get('HTTP_X_USER_ID'),
149
155
                    project_id=env.get('HTTP_X_TENANT_ID'),
150
 
                    resource_id=account.partition('AUTH_')[2],
 
156
                    resource_id=account.partition(self.reseller_prefix)[2],
151
157
                    timestamp=now,
152
158
                    resource_metadata=resource_metadata)])
153
159
 
159
165
                    volume=bytes_sent,
160
166
                    user_id=env.get('HTTP_X_USER_ID'),
161
167
                    project_id=env.get('HTTP_X_TENANT_ID'),
162
 
                    resource_id=account.partition('AUTH_')[2],
 
168
                    resource_id=account.partition(self.reseller_prefix)[2],
163
169
                    timestamp=now,
164
170
                    resource_metadata=resource_metadata)])
165
171
 
173
179
                volume=1,
174
180
                user_id=env.get('HTTP_X_USER_ID'),
175
181
                project_id=env.get('HTTP_X_TENANT_ID'),
176
 
                resource_id=account.partition('AUTH_')[2],
 
182
                resource_id=account.partition(self.reseller_prefix)[2],
177
183
                timestamp=now,
178
184
                resource_metadata=resource_metadata)])
179
185