From bf878a5c6e9525be3665233662fb244d4043e178 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 24 Oct 2017 19:52:46 -0400 Subject: [PATCH] Fix up prepare-node-common playbook Use the bool filter to default to false, if use_puppetlabs is missing. Also attempt to fix up vars setting in .zuul.yaml Change-Id: I277619847ed3a4c99845471a541820e559efab5d Signed-off-by: Paul Belanger --- .zuul.yaml | 2 +- playbooks/prepare-node-common.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d9118f05d..1a16da803 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ name: puppet-openstack-base pre-run: playbooks/prepare-node-common vars: - use_puppetlabs: False + use_puppetlabs: False - job: name: puppet-openstack-integration-base diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index e97ba9cba..c0ea11c0f 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -59,4 +59,5 @@ environment: '{{ zuul | zuul_legacy_vars }}' become: true when: - - use_puppetlabs + - use_puppetlabs is defined + - use_puppetlabs|bool