diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2017-09-08 08:53:47 +0200 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> | 2017-12-20 16:42:06 +0100 |
| commit | c5043212ea2221626d2b076291c75a3c69a02b81 (patch) | |
| tree | 61e444fb7e30d2922d842f66a4f02a9523384dfd | |
| parent | 17a4ae8c780596dcf622ebc05340a257e87d5f09 (diff) | |
| download | zuul-c5043212ea2221626d2b076291c75a3c69a02b81.tar.gz | |
Use connection type supplied from nodepool
For supporting windows nodes we need the connection type to be
configurable. This adds the ansible_connection host variable if
nodepool defines it.
Change-Id: I6d2f81c7586ae0d533add95ea96a9ea8ce8c3ab5
| -rwxr-xr-x | tests/base.py | 6 | ||||
| -rw-r--r-- | tests/fixtures/config/inventory/git/common-config/zuul.yaml | 2 | ||||
| -rw-r--r-- | tests/unit/test_inventory.py | 10 | ||||
| -rw-r--r-- | zuul/executor/server.py | 4 | ||||
| -rw-r--r-- | zuul/model.py | 1 |
5 files changed, 22 insertions, 1 deletions
diff --git a/tests/base.py b/tests/base.py index a51eeddcd..7e63129ea 100755 --- a/tests/base.py +++ b/tests/base.py @@ -1432,7 +1432,8 @@ class RecordingAnsibleJob(zuul.executor.server.AnsibleJob): self.log.debug("hostlist") hosts = super(RecordingAnsibleJob, self).getHostList(args) for host in hosts: - host['host_vars']['ansible_connection'] = 'local' + if not host['host_vars'].get('ansible_connection'): + host['host_vars']['ansible_connection'] = 'local' hosts.append(dict( name=['localhost'], @@ -1738,6 +1739,9 @@ class FakeNodepool(object): executor='fake-nodepool') if 'fakeuser' in node_type: data['username'] = 'fakeuser' + if 'windows' in node_type: + data['connection_type'] = 'winrm' + data = json.dumps(data).encode('utf8') path = self.client.create(path, data, makepath=True, diff --git a/tests/fixtures/config/inventory/git/common-config/zuul.yaml b/tests/fixtures/config/inventory/git/common-config/zuul.yaml index ad530a783..36789a321 100644 --- a/tests/fixtures/config/inventory/git/common-config/zuul.yaml +++ b/tests/fixtures/config/inventory/git/common-config/zuul.yaml @@ -38,6 +38,8 @@ label: default-label - name: fakeuser label: fakeuser-label + - name: windows + label: windows-label - job: name: base diff --git a/tests/unit/test_inventory.py b/tests/unit/test_inventory.py index 1c41f5fa5..be504475a 100644 --- a/tests/unit/test_inventory.py +++ b/tests/unit/test_inventory.py @@ -119,5 +119,15 @@ class TestInventory(ZuulTestCase): self.assertEqual( inventory['all']['hosts'][node_name]['ansible_user'], username) + # check if the nodes use the correct or no ansible_connection + if node_name == 'windows': + self.assertEqual( + inventory['all']['hosts'][node_name]['ansible_connection'], + 'winrm') + else: + self.assertEqual( + 'local', + inventory['all']['hosts'][node_name]['ansible_connection']) + self.executor_server.release() self.waitUntilSettled() diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 22dee9aca..5a710a62d 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -931,6 +931,10 @@ class AnsibleJob(object): if username: host_vars['ansible_user'] = username + connection_type = node.get('connection_type') + if connection_type: + host_vars['ansible_connection'] = connection_type + host_keys = [] for key in node.get('host_keys'): if port != 22: diff --git a/zuul/model.py b/zuul/model.py index 77770b793..dbae1f296 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -384,6 +384,7 @@ class Node(object): self.private_ipv4 = None self.public_ipv6 = None self.connection_port = 22 + self.connection_type = None self._keys = [] self.az = None self.provider = None |