From c7fd5e8b21069ca0fdd64aee79b2e8651ad67bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Tue, 15 Dec 2015 20:08:16 +0100 Subject: [PATCH] 'admin_user' opt (and others) imported twice "admin_user", "admin_tenant_name", "admin_password" and "auth_uri" are options which are imported from the "keystone_authtoken" group, itself being part of the "keystonemiddleware" 3rd-party library. The problem is that these options are imported at 2 different locations in the codebase: - watcher/applier/manager.py - watcher/common/keystone.py Removed one from the applier. Change-Id: Ie7075883018ec69f6a4e8190f50a9ea949ab9745 Closes-Bug: #1526259 --- watcher/applier/manager.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/watcher/applier/manager.py b/watcher/applier/manager.py index f3b7c0803..246d755da 100644 --- a/watcher/applier/manager.py +++ b/watcher/applier/manager.py @@ -57,15 +57,6 @@ opt_group = cfg.OptGroup(name='watcher_applier', CONF.register_group(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): # todo(jed) need workflow