Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "'admin_user' opt (and others) imported twice"

Browse Source
This commit is contained in:
Jenkins
2015-12-18 12:48:56 +00:00
committed by Gerrit Code Review
parent 1698eb31f3 c7fd5e8b21
commit 8f2ca2518f
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
watcher/applier/manager.py
View File

@@ -57,15 +57,6 @@ opt_group = cfg.OptGroup(name='watcher_applier',
CONF.register_group(opt_group) CONF.register_group(opt_group)
CONF.register_opts(APPLIER_MANAGER_OPTS, opt_group) CONF.register_opts(APPLIER_MANAGER_OPTS, opt_group)
CONF.import_opt('admin_user', 'keystonemiddleware.auth_token',
group='keystone_authtoken')
CONF.import_opt('admin_tenant_name', 'keystonemiddleware.auth_token',
group='keystone_authtoken')
CONF.import_opt('admin_password', 'keystonemiddleware.auth_token',
group='keystone_authtoken')
CONF.import_opt('auth_uri', 'keystonemiddleware.auth_token',
group='keystone_authtoken')
class ApplierManager(MessagingCore): class ApplierManager(MessagingCore):
# todo(jed) need workflow # todo(jed) need workflow