zuul
/
nodepool
Code Issues Proposed changes

Create group for label type 

Currently, we get OOTB groups per provider and per image.
It would be nice to have also groups per label type, for running
plays against a particular label.

Change-Id: Ib4173fc0c15184444a91dc402bb306d34f295106
This commit is contained in:
Ricardo Carrillo Cruz 2017-06-13 14:22:19 +02:00
parent a0159428d7
commit 7c3263c7df
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

@ -315,6 +315,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_id=None, image_name=None,
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():