summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2018-12-12 10:47:13 +0800
committerzhurong <aaronzhu1121@gmail.com>2018-12-12 10:47:13 +0800
commit251dfc36720f1b4146b5c3b6e8b91e74d26212bc (patch)
tree8de70b8f25644edf1efa9325c67fe2c403f0dbfc
parentabe0516df0cfc669bd111c3e90ebbed04abe9b00 (diff)
Fix unittest no such option None in group DEFAULT errorHEADmaster
Notes
Notes (review): Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 12 Dec 2018 08:39:03 +0000 Reviewed-on: https://review.openstack.org/624554 Project: openstack/murano Branch: refs/heads/master
-rw-r--r--murano/common/auth_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/murano/common/auth_utils.py b/murano/common/auth_utils.py
index 7bf032f..8e02f17 100644
--- a/murano/common/auth_utils.py
+++ b/murano/common/auth_utils.py
@@ -124,7 +124,7 @@ def delete_trust(trust):
124 124
125 125
126def _get_config_option(conf_section, option_name, default=None): 126def _get_config_option(conf_section, option_name, default=None):
127 if hasattr(cfg.CONF[conf_section], option_name): 127 if conf_section and hasattr(cfg.CONF[conf_section], option_name):
128 return getattr(cfg.CONF[conf_section], option_name) 128 return getattr(cfg.CONF[conf_section], option_name)
129 return default 129 return default
130 130