From 16912d9e8a1f4de204cf7e0f7af84581e1a7cb4c Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 13 Jun 2017 11:53:13 -0400 Subject: [PATCH] Create nodepool dictionary for ansible inventory This moves our nodepool variables more inline with how we handle our zuul ansible variables. Both will now be a dict. Change-Id: I069203328cce0bc2d4bf31f31351209bf2b6cb5a Depends-On: Ia13e6e9e89d24ac3c9c62a0286fba0279b5408b3 Signed-off-by: Paul Belanger --- .../ansible/git/common-config/playbooks/check-vars.yaml | 6 +++--- zuul/executor/server.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) 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 1f8fdf3e1c..ce392a4017 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 @@ -3,9 +3,9 @@ - name: Assert nodepool variables are valid. assert: that: - - nodepool_az == 'test-az' - - nodepool_region == 'test-region' - - nodepool_provider == 'test-provider' + - nodepool.az == 'test-az' + - nodepool.region == 'test-region' + - nodepool.provider == 'test-provider' - name: Assert zuul-executor variables are valid. assert: diff --git a/zuul/executor/server.py b/zuul/executor/server.py index c498fa4638..758fd2a304 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -903,9 +903,10 @@ class AnsibleJob(object): host_vars = dict( ansible_host=ip, ansible_user=self.executor_server.default_username, - nodepool_az=node.get('az'), - nodepool_provider=node.get('provider'), - nodepool_region=node.get('region')) + nodepool=dict( + az=node.get('az'), + provider=node.get('provider'), + region=node.get('region'))) host_keys = [] for key in node.get('host_keys'):