diff options
| -rw-r--r-- | ceilometerclient/client.py | 8 | ||||
| -rw-r--r-- | ceilometerclient/shell.py | 11 |
2 files changed, 2 insertions, 17 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 17a75bc..8673e70 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -94,14 +94,10 @@ def _get_keystone_session(**kwargs): project_domain_name = kwargs.pop('project_domain_name', None) project_domain_id = kwargs.pop('project_domain_id', None) if v3_auth_url: - if not user_domain_id: - user_domain_id = 'default' if not user_domain_name: - user_domain_name = 'default' - if not project_domain_id: - project_domain_id = 'default' + user_domain_name = 'Default' if not project_domain_name: - project_domain_name = 'default' + project_domain_name = 'Default' auth = None use_domain = (user_domain_id or user_domain_name or diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 0b3002c..799a537 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -117,19 +117,9 @@ class CeilometerShell(object): version, 'shell') self._find_actions(subparsers, submodule) self._find_actions(subparsers, self) - self._add_bash_completion_subparser(subparsers) return parser - def _add_bash_completion_subparser(self, subparsers): - subparser = subparsers.add_parser( - 'bash_completion', - add_help=False, - formatter_class=HelpFormatter - ) - self.subcommands['bash_completion'] = subparser - subparser.set_defaults(func=self.do_bash_completion) - def _find_actions(self, subparsers, actions_module): for attr in (a for a in dir(actions_module) if a.startswith('do_')): # I prefer to be hypen-separated instead of underscores. @@ -243,7 +233,6 @@ class CeilometerShell(object): options.add(option) commands.remove('bash-completion') - commands.remove('bash_completion') print(' '.join(commands | options)) @utils.arg('command', metavar='<subcommand>', nargs='?', |