openstack/python-tripleoclient
Code Issues Proposed changes

Minor fixes for container image prepare command

Browse Source 
This makes two changes:
- makes sure the documented command written to the env file is valid
  by prepending "openstack"
- removes the "params" entries from the container_images list
  regardless of whether --env-file is specified

Change-Id: I3343df54741e13ddd5a4aa991a5af68c0593833c
This commit is contained in:
Steve Baker 2017-07-14 12:03:53 +12:00
parent 1b6585494f
commit 9ff9b7c663
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tripleoclient/v1/container_image.py
View File

@ -244,20 +244,15 @@ class PrepareImageFiles(command.Command):
)
return parser
def write_env_file(self, result, env_file):
params = {}
for entry in result:
imagename = entry.get('imagename', '')
if 'params' in entry:
for p in entry.pop('params'):
params[p] = imagename
def write_env_file(self, params, env_file):
with os.fdopen(os.open(env_file,
os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o666),
'w') as f:
f.write('# Generated with the following on %s\n#\n' %
datetime.datetime.now().isoformat())
f.write('# %s\n#\n\n' % ' '.join(self.app.command_options))
f.write('# openstack %s\n#\n\n' %
' '.join(self.app.command_options))
yaml.safe_dump({'parameter_defaults': params}, f,
default_flow_style=False)
@ -285,8 +280,15 @@ class PrepareImageFiles(command.Command):
builder = kolla_builder.KollaImageBuilder([parsed_args.template_file])
result = builder.container_images_from_template(filter=ffunc, **subs)
params = {}
for entry in result:
imagename = entry.get('imagename', '')
if 'params' in entry:
for p in entry.pop('params'):
params[p] = imagename
if parsed_args.env_file:
self.write_env_file(result, parsed_args.env_file)
self.write_env_file(params, parsed_args.env_file)
result_str = yaml.safe_dump({'container_images': result},
default_flow_style=False)