092aad40bd
Things changed, and the configuration wasn't read anymore. This patch fixes that. It also remove duplicated code in acl.py, so the problem is fixed only in one place. Finally, it uses prepare_service() to find the right configuration file for ceilometer. This fixes bug #1098204 Change-Id: I0d6c30ad443a4d0db201e60d12b275625a4bee6e Signed-off-by: Julien Danjou <julien@danjou.info>
30 lines
1.1 KiB
Python
30 lines
1.1 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Handle the ACL to acces the API server."""
|
|
|
|
from ceilometer import policy
|
|
from ceilometer.api import acl
|
|
|
|
|
|
def get_limited_to_project(headers):
|
|
"""Return the tenant the request should be limited to."""
|
|
if not policy.check_is_admin(headers.get('X-Roles', "").split(","),
|
|
headers.get('X-Tenant-Id'),
|
|
headers.get('X-Tenant-Name')):
|
|
return headers.get('X-Tenant-Id')
|