From f2a57670a73ae09669f8d1fa092128b95c71e9ea Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 18 Jan 2016 19:41:56 -0500 Subject: [PATCH] Define defaults as defaults, not variables Defining them as variables overrides the local group_vars defined in system-config. But these are defaults, not the actual variables. Change-Id: I40acef591a22005434960af1ee13497c963df7d9 --- defaults/main.yml | 4 ++++ vars/main.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index cb90316..8d49dd6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,6 @@ --- # defaults file for ansible-puppet +copy_hieradata: false +copy_puppet: false +hieradata: /etc/puppet/hieradata +puppet_environment: production diff --git a/vars/main.yml b/vars/main.yml index 5ebc5ab..3856fd2 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,2 @@ --- # vars file for ansible-puppet -copy_hieradata: false -copy_puppet: false -hieradata: /etc/puppet/hieradata -puppet_environment: production