zuul
/
zuul
Code Issues Proposed changes

Merge "Create nodepool.cloud inventory variable" into feature/zuulv3

This commit is contained in:
Zuul 2017-08-16 18:18:24 +00:00 committed by Gerrit Code Review
parent 3d4c5f2cc1 d28c755ee6
commit 0942e372fe
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/base.py
View File

@ -1659,6 +1659,7 @@ class FakeNodepool(object):
now = time.time()
path = '/nodepool/nodes/'
data = dict(type=node_type,
cloud='test-cloud',
provider='test-provider',
region='test-region',
az='test-az',

1
tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml vendored
View File

@ -4,6 +4,7 @@
assert:
that:
- nodepool.az == 'test-az'
- nodepool.cloud == 'test-cloud'
- nodepool.region == 'test-region'
- nodepool.provider == 'test-provider'

1
zuul/executor/client.py
View File

@ -223,6 +223,7 @@ class ExecutorClient(object):
for node in nodeset.getNodes():
nodes.append(dict(name=node.name, label=node.label,
az=node.az,
cloud=node.cloud,
host_keys=node.host_keys,
provider=node.provider,
region=node.region,

1
zuul/executor/server.py
View File

@ -1156,6 +1156,7 @@ class AnsibleJob(object):
ansible_port=port,
nodepool=dict(
az=node.get('az'),
cloud=node.get('cloud'),
provider=node.get('provider'),
region=node.get('region')))