From 6260b48b9edd07ea4af5712c9977a21fb0d063f0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 12 Jan 2016 08:27:56 -0500 Subject: [PATCH] Clean up codestyle in conditionals Based on some earlier review feedback, add defaults for copy_puppet and copy_hieradata so that we don't have to check if they are defined. Also, split the and condition in when to be a list of conditions. Change-Id: I68bd332bdfae6880b582203161798f709dc45a45 --- tasks/main.yml | 6 ++++-- vars/main.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7dd7b24..0134949 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -54,7 +54,7 @@ dest: "{{ manifest_base }}/hieradata" state: link - when: copy_hieradata is defined and copy_hieradata + when: copy_hieradata - block: - name: copy puppet modules @@ -67,7 +67,9 @@ src: /etc/puppet/modules dest: /etc/puppet - when: copy_puppet is defined and copy_puppet and manifest_base is defined + when: + - copy_puppet + - manifest_base is defined - name: run puppet puppet: diff --git a/vars/main.yml b/vars/main.yml index eb8990e..2701e0c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,6 @@ --- # vars file for ansible-puppet +copy_hieradata: false +copy_puppet: false hieradata: /etc/puppet/hieradata hieraenvironment: production