From a9f2bd176990aec758803792dc2eb03dfb064bde Mon Sep 17 00:00:00 2001 From: Artur Svechnikov Date: Wed, 30 Dec 2015 14:36:21 +0300 Subject: [PATCH] Pass label to bootstrap image metadata Change-Id: Ia6bb0e234232966ba03b2935a7bd66b8e965632b Closes-Bug: #1529876 --- bareon/drivers/deploy/nailgun.py | 1 + .../fuel_bootstrap_cli/fuel_bootstrap/utils/data.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bareon/drivers/deploy/nailgun.py b/bareon/drivers/deploy/nailgun.py index eb7c626..0b2311e 100644 --- a/bareon/drivers/deploy/nailgun.py +++ b/bareon/drivers/deploy/nailgun.py @@ -401,6 +401,7 @@ class Manager(BaseDeployDriver): 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: diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py index 563848b..172b56b 100644 --- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py +++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py @@ -82,7 +82,8 @@ class BootstrapDataBuilder(object): 'container': { 'meta_file': consts.METADATA_FILE, 'format': self.container_format - } + }, + 'label': self.label }, 'repos': self._get_repos(), 'proxies': self._get_proxy_settings(),