From 7fc585e1ab922e30c2994d6a735feacce4487715 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 17 Aug 2018 13:43:46 -0500
Subject: [PATCH] Allow overiding the remote hieradata link dest
In order to support the layouts being different on the management server
and the remote nodes, we need to also be able to override the location
of the link that gets made. Add a variable that defaults to the old
value.
Change-Id: I7434c1b1a9d79f04b3e872e750057d69490e80e0
---
defaults/main.yml | 1 +
tasks/main.yaml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 58573eb..70dfb5c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,3 +18,4 @@ puppet_environment: production
puppet_timeout: 30m
futureparser: False
mgmt_manifestpath: '{{ manifest_base }}/{{ puppet_environment }}'
+puppet_hieradata_link_dest: '{{ manifest_base }}/hieradata'
diff --git a/tasks/main.yaml b/tasks/main.yaml
index ea8dfd1..10a4c6b 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -79,7 +79,7 @@
- name: ensure hieradata manifest link is present
file:
src: "{{ '/etc/puppet/hieradata' if puppet_version == '3' else '/etc/puppetlabs/code/environments' }}"
- dest: "{{ manifest_base }}/hieradata"
+ dest: "{{ puppet_hieradata_link_dest }}"
state: link
when: copy_hieradata