Merge "Create nodepool.cloud inventory variable" into feature/zuulv3
This commit is contained in:
commit
0942e372fe
|
@ -1659,6 +1659,7 @@ class FakeNodepool(object):
|
||||||
now = time.time()
|
now = time.time()
|
||||||
path = '/nodepool/nodes/'
|
path = '/nodepool/nodes/'
|
||||||
data = dict(type=node_type,
|
data = dict(type=node_type,
|
||||||
|
cloud='test-cloud',
|
||||||
provider='test-provider',
|
provider='test-provider',
|
||||||
region='test-region',
|
region='test-region',
|
||||||
az='test-az',
|
az='test-az',
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- nodepool.az == 'test-az'
|
- nodepool.az == 'test-az'
|
||||||
|
- nodepool.cloud == 'test-cloud'
|
||||||
- nodepool.region == 'test-region'
|
- nodepool.region == 'test-region'
|
||||||
- nodepool.provider == 'test-provider'
|
- nodepool.provider == 'test-provider'
|
||||||
|
|
||||||
|
|
|
@ -223,6 +223,7 @@ class ExecutorClient(object):
|
||||||
for node in nodeset.getNodes():
|
for node in nodeset.getNodes():
|
||||||
nodes.append(dict(name=node.name, label=node.label,
|
nodes.append(dict(name=node.name, label=node.label,
|
||||||
az=node.az,
|
az=node.az,
|
||||||
|
cloud=node.cloud,
|
||||||
host_keys=node.host_keys,
|
host_keys=node.host_keys,
|
||||||
provider=node.provider,
|
provider=node.provider,
|
||||||
region=node.region,
|
region=node.region,
|
||||||
|
|
|
@ -1156,6 +1156,7 @@ class AnsibleJob(object):
|
||||||
ansible_port=port,
|
ansible_port=port,
|
||||||
nodepool=dict(
|
nodepool=dict(
|
||||||
az=node.get('az'),
|
az=node.get('az'),
|
||||||
|
cloud=node.get('cloud'),
|
||||||
provider=node.get('provider'),
|
provider=node.get('provider'),
|
||||||
region=node.get('region')))
|
region=node.get('region')))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue