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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-10-24 19:52:46 -04:00
parent f6cdcd2b7d
commit bf878a5c6e
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 3 additions and 2 deletions

View File

@ -2,7 +2,7 @@
name: puppet-openstack-base name: puppet-openstack-base
pre-run: playbooks/prepare-node-common pre-run: playbooks/prepare-node-common
vars: vars:
use_puppetlabs: False use_puppetlabs: False
- job: - job:
name: puppet-openstack-integration-base name: puppet-openstack-integration-base

View File

@ -59,4 +59,5 @@
environment: '{{ zuul | zuul_legacy_vars }}' environment: '{{ zuul | zuul_legacy_vars }}'
become: true become: true
when: when:
- use_puppetlabs - use_puppetlabs is defined
- use_puppetlabs|bool