Merge "tests: do not override auth version to v2"
This commit is contained in:
commit
1b8d826bc2
@ -24,8 +24,6 @@ import pecan.testing
|
||||
from ceilometer.api import rbac
|
||||
from ceilometer.tests import db as db_test_base
|
||||
|
||||
OPT_GROUP_NAME = 'keystone_authtoken'
|
||||
cfg.CONF.import_group(OPT_GROUP_NAME, "keystonemiddleware.auth_token")
|
||||
cfg.CONF.import_group('api', 'ceilometer.api.controllers.v2.root')
|
||||
|
||||
|
||||
@ -44,8 +42,6 @@ class FunctionalTest(db_test_base.TestBase):
|
||||
self.setup_messaging(self.CONF)
|
||||
opts.set_defaults(self.CONF)
|
||||
|
||||
self.CONF.set_override("auth_version", "v2.0",
|
||||
group=OPT_GROUP_NAME)
|
||||
self.CONF.set_override("policy_file",
|
||||
self.path_get('etc/ceilometer/policy.json'),
|
||||
group='oslo_policy')
|
||||
|
Loading…
Reference in New Issue
Block a user