x/snap.openstack
Code Issues Proposed changes

Pass dict as keyword args to format calls

Browse Source
This commit is contained in:
James Page 2016-11-10 09:40:49 +00:00
parent d83c0415e9
commit 069f63f1de
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snap_openstack/base.py
View File

@ -73,12 +73,12 @@ class OpenStackSnap():
renderer = SnapFileRenderer() renderer = SnapFileRenderer()
for dirs in setup['dirs']: for dirs in setup['dirs']:
dir_name = dirs.format(self.snap_env) dir_name = dirs.format(**self.snap_env)
ensure_dir(dir_name) ensure_dir(dir_name)
for template in setup['templates']: for template in setup['templates']:
target = setup['templates'][template] target = setup['templates'][template]
target_file = target.format(self.snap_env) target_file = target.format(**self.snap_env)
ensure_dir(target_file) ensure_dir(target_file)
LOG.info('Rendering {} to {}'.format(template, LOG.info('Rendering {} to {}'.format(template,
target_file)) target_file))
@ -100,7 +100,7 @@ class OpenStackSnap():
cmd = [entry_point['binary']] cmd = [entry_point['binary']]
for cfile in entry_point.get('config-files', []): for cfile in entry_point.get('config-files', []):
cfile = cfile.format(self.snap_env) cfile = cfile.format(**self.snap_env)
if os.path.exists(cfile): if os.path.exists(cfile):
cmd.append('--config-file={}'.format(cfile)) cmd.append('--config-file={}'.format(cfile))
else: else:
@ -108,7 +108,7 @@ class OpenStackSnap():
', skipping'.format(cfile)) ', skipping'.format(cfile))
for cdir in entry_point.get('config-dirs', []): for cdir in entry_point.get('config-dirs', []):
cdir = cdir.format(self.snap_env) cdir = cdir.format(**self.snap_env)
if os.path.exists(cdir): if os.path.exists(cdir):
cmd.append('--config-dir={}'.format(cdir)) cmd.append('--config-dir={}'.format(cdir))
else: else:
@ -117,7 +117,7 @@ class OpenStackSnap():
log_file = entry_point.get('log-file') log_file = entry_point.get('log-file')
if log_file: if log_file:
log_file = log_file.format(self.snap_env) log_file = log_file.format(**self.snap_env)
cmd.append('--log-file={}'.format(log_file)) cmd.append('--log-file={}'.format(log_file))
# Ensure any arguments passed to wrapper are propagated # Ensure any arguments passed to wrapper are propagated