openstack
/
fuel-agent
Code Issues Proposed changes

Merge "Pass label to bootstrap image metadata"

This commit is contained in:
Jenkins 2015-12-30 16:33:39 +00:00 committed by Gerrit Code Review
parent 6f2bf66ef6 2028284ad2
commit cfa3fee581
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py
View File

@ -81,7 +81,8 @@ class BootstrapDataBuilder(object):
'container': {
'meta_file': consts.METADATA_FILE,
'format': self.container_format
}
},
'label': self.label
},
'repos': repos,
'proxies': self._get_proxy_settings(),

1
fuel_agent/manager.py
View File

@ -646,6 +646,7 @@ class Manager(object):
drop_data['os'] = metadata['os']
drop_data['all_packages'] = metadata['all_packages']
drop_data['repos'] = metadata['repos']
drop_data['label'] = bootstrap_scheme.label
LOG.debug('Image metadata: %s', drop_data)
with open(meta_file, 'wt') as f: