From d28c755ee660ea7ad9e6124ad850e7850b25f6d7 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 11 Aug 2017 13:10:38 -0400
Subject: [PATCH] Create nodepool.cloud inventory variable

It is possible we want to know the name of the cloud, which could be
different from nodepool.provider. In the case of openstack-infra, this
is to fix a DNS issue by when creating the mirror name of our regional
mirrors.

Change-Id: I3ac65744356e3fa25d10208d11be95dc16b1e2e7
Depends-On: Idc7686167d131d8e74d55b8f7f50224a1b782091
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 tests/base.py                                                    | 1 +
 .../config/ansible/git/common-config/playbooks/check-vars.yaml   | 1 +
 zuul/executor/client.py                                          | 1 +
 zuul/executor/server.py                                          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/tests/base.py b/tests/base.py
index 480db83826..028a8b127b 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -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',
diff --git a/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml b/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
index cd343d0b1c..a63ecbf225 100644
--- a/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
+++ b/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
@@ -4,6 +4,7 @@
       assert:
         that:
           - nodepool.az == 'test-az'
+          - nodepool.cloud == 'test-cloud'
           - nodepool.region == 'test-region'
           - nodepool.provider == 'test-provider'
 
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index 6d1a54f1ff..1c3693dc28 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -218,6 +218,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,
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 95e8e0b54b..be12812a8d 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1152,6 +1152,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')))