openstack
/
python-tripleoclient
Code Issues Proposed changes

Don't filter config keys by default 

Having a hard-coded list of keys in the client is fragile and also
makes it non-obvious when you add a new key to t-h-t and nothing
appears when dumping the config via tripleoclient.

Instead lets dump all keys by default, and offer the option of
filtering by key if needed.

Change-Id: I53cacf7a085fe6699539cc08ead5c12d392cdc33
This commit is contained in:
Steven Hardy 2017-07-14 10:57:14 +01:00
parent 3d4e2d20e8
commit 805b7b7543
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tripleoclient/v1/overcloud_config.py
View File

@ -12,6 +12,7 @@
import logging
import os
import six
import tempfile
import yaml
@ -47,12 +48,8 @@ class DownloadConfig(command.Command):
'--config-type',
dest='config_type',
type=list,
default=['config_settings', 'global_config_settings',
'logging_sources', 'monitoring_subscriptions',
'service_config_settings', 'service_metadata_settings',
'service_names', 'step_config', 'upgrade_batch_tasks',
'upgrade_tasks'],
help=_('Type of object config to be extract from the deployment'),
help=_('Type of object config to be extract from the deployment, '
'defaults to all keys available'),
)
return parser
@ -69,7 +66,6 @@ class DownloadConfig(command.Command):
clients = self.app.client_manager
name = parsed_args.name
configs = parsed_args.config_type
config_dir = parsed_args.config_dir
if not os.path.exists(config_dir):
try:
@ -85,29 +81,29 @@ class DownloadConfig(command.Command):
self.log.info("Generating configuration under the directory: "
"%s" % tmp_path)
role_data = utils.get_role_data(stack)
for role in role_data:
for config in configs:
for role_name, role in six.iteritems(role_data):
for config in parsed_args.config_type or role.keys():
if 'step_config' in config:
with open('%s/%s-%s.pp' % (tmp_path,
config,
role), 'w') as step_config:
with open('%s/%s-%s.pp' %
(tmp_path, config, role_name),
'w') as step_config:
step_config.write('\n'.join(step for step in
role_data[role][config]
role[config]
if step is not None))
else:
if 'upgrade_tasks' in config:
data = self._convert_playbook(role_data[role][config],
role)
data = self._convert_playbook(role[config],
role_name)
else:
try:
data = role_data[role][config]
data = role[config]
except KeyError as e:
message = 'Invalide key: %s, error: %s' % (config,
str(e))
raise KeyError(message)
with open('%s/%s-%s.yaml' % (tmp_path,
config,
role), 'w') as conf_file:
role_name), 'w') as conf_file:
yaml.safe_dump(data,
conf_file,
default_flow_style=False)