diff options
Diffstat (limited to 'bin/ansible-config')
| -rwxr-xr-x | bin/ansible-config | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/bin/ansible-config b/bin/ansible-config index f394ef7c..c8d99ea0 100755 --- a/bin/ansible-config +++ b/bin/ansible-config @@ -23,7 +23,7 @@ from ansible import constants as C from ansible.cli.arguments import option_helpers as opt_help from ansible.config.manager import ConfigManager, Setting from ansible.errors import AnsibleError, AnsibleOptionsError -from ansible.module_utils.common.text.converters import to_native, to_text, to_bytes +from ansible.module_utils._text import to_native, to_text, to_bytes from ansible.module_utils.common.json import json_dump from ansible.module_utils.six import string_types from ansible.parsing.quoting import is_quoted @@ -67,7 +67,7 @@ class ConfigCLI(CLI): desc="View ansible configuration.", ) - common = opt_help.ArgumentParser(add_help=False) + common = opt_help.argparse.ArgumentParser(add_help=False) opt_help.add_verbosity_options(common) common.add_argument('-c', '--config', dest='config_file', help="path to configuration file, defaults to first file found in precedence.") @@ -187,7 +187,7 @@ class ConfigCLI(CLI): # pylint: disable=unreachable try: - editor = shlex.split(C.config.get_config_value('EDITOR')) + editor = shlex.split(os.environ.get('EDITOR', 'vi')) editor.append(self.config_file) subprocess.call(editor) except Exception as e: @@ -314,7 +314,7 @@ class ConfigCLI(CLI): return data - def _get_settings_ini(self, settings, seen): + def _get_settings_ini(self, settings): sections = {} for o in sorted(settings.keys()): @@ -327,7 +327,7 @@ class ConfigCLI(CLI): if not opt.get('description'): # its a plugin - new_sections = self._get_settings_ini(opt, seen) + new_sections = self._get_settings_ini(opt) for s in new_sections: if s in sections: sections[s].extend(new_sections[s]) @@ -343,45 +343,37 @@ class ConfigCLI(CLI): if 'ini' in opt and opt['ini']: entry = opt['ini'][-1] - if entry['section'] not in seen: - seen[entry['section']] = [] if entry['section'] not in sections: sections[entry['section']] = [] - # avoid dupes - if entry['key'] not in seen[entry['section']]: - seen[entry['section']].append(entry['key']) - - default = opt.get('default', '') - if opt.get('type', '') == 'list' and not isinstance(default, string_types): - # python lists are not valid ini ones - default = ', '.join(default) - elif default is None: - default = '' - - if context.CLIARGS['commented']: - entry['key'] = ';%s' % entry['key'] + default = opt.get('default', '') + if opt.get('type', '') == 'list' and not isinstance(default, string_types): + # python lists are not valid ini ones + default = ', '.join(default) + elif default is None: + default = '' - key = desc + '\n%s=%s' % (entry['key'], default) + if context.CLIARGS['commented']: + entry['key'] = ';%s' % entry['key'] - sections[entry['section']].append(key) + key = desc + '\n%s=%s' % (entry['key'], default) + sections[entry['section']].append(key) return sections def execute_init(self): """Create initial configuration""" - seen = {} data = [] config_entries = self._list_entries_from_args() plugin_types = config_entries.pop('PLUGINS', None) if context.CLIARGS['format'] == 'ini': - sections = self._get_settings_ini(config_entries, seen) + sections = self._get_settings_ini(config_entries) if plugin_types: for ptype in plugin_types: - plugin_sections = self._get_settings_ini(plugin_types[ptype], seen) + plugin_sections = self._get_settings_ini(plugin_types[ptype]) for s in plugin_sections: if s in sections: sections[s].extend(plugin_sections[s]) |