openstack/trove
Code Issues Proposed changes

Merge "Remove unused admin_context from conductor manager"

Browse Source
This commit is contained in:
Jenkins 2014-02-27 09:13:31 +00:00 committed by Gerrit Code Review
commit 3ca0f3db6d
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/trove/trove-conductor.conf.sample
View File

@ -3,8 +3,5 @@ verbose = True
debug = True
control_exchange = trove
trove_auth_url = http://0.0.0.0:5000/v2.0
nova_proxy_admin_pass = 3de4922d8b6ac5a1aad9
nova_proxy_admin_tenant_name = admin
nova_proxy_admin_user = admin
sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
rabbit_password = f7999d1955c5014aa32c

5
trove/conductor/manager.py
View File

@ -15,7 +15,6 @@
from trove.backup import models as bkup_models
from trove.common import cfg
from trove.common import exception
from trove.common.context import TroveContext
from trove.common.instance import ServiceStatus
from trove.conductor.models import LastSeen
from trove.instance import models as t_models
@ -32,10 +31,6 @@ class Manager(periodic_task.PeriodicTasks):
def __init__(self):
super(Manager, self).__init__()
self.admin_context = TroveContext(
user=CONF.nova_proxy_admin_user,
auth_token=CONF.nova_proxy_admin_pass,
tenant=CONF.nova_proxy_admin_tenant_name)
def _message_too_old(self, instance_id, method_name, sent):
fields = {