zuul/nodepool
Code Issues Proposed changes

Merge "Create group for label type" into feature/zuulv3

Browse Source
This commit is contained in:
Jenkins 2017-06-13 17:34:36 +00:00 committed by Gerrit Code Review
commit 279809ed1d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nodepool/launcher.py
View File

@ -321,6 +321,7 @@ class NodeLauncher(threading.Thread, StatsReporter):
az=self._node.az,
config_drive=config_drive,
nodepool_node_id=self._node.id,
nodepool_node_label=self._node.type,
nodepool_image_name=image_name,
networks=self._pool.networks,
boot_from_volume=self._label.boot_from_volume,

7
nodepool/provider_manager.py
View File

@ -188,7 +188,8 @@ class ProviderManager(object):
def createServer(self, name, image,
flavor_name=None, min_ram=None,
az=None, key_name=None, config_drive=True,
nodepool_node_id=None, nodepool_image_name=None,
nodepool_node_id=None, nodepool_node_label=None,
nodepool_image_name=None,
networks=None, boot_from_volume=False, volume_size=50):
if not networks:
networks = []
@ -226,6 +227,8 @@ class ProviderManager(object):
if nodepool_image_name:
groups_list.append(nodepool_image_name)
if nodepool_node_label:
groups_list.append(nodepool_node_label)
meta = dict(
groups=",".join(groups_list),
nodepool_provider_name=self.provider.name,
@ -234,6 +237,8 @@ class ProviderManager(object):
meta['nodepool_node_id'] = nodepool_node_id
if nodepool_image_name:
meta['nodepool_image_name'] = nodepool_image_name
if nodepool_node_label:
meta['nodepool_node_label'] = nodepool_node_label
create_args['meta'] = meta
with shade_inner_exceptions():