From f5ec19782a93526382b828606119a2c427ab9664 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 22 Jan 2016 18:54:41 -0500
Subject: [PATCH] Don't try to make a link before the directory

We need to copy the puppet modules BEFORE we make a link to the
hieradata into the manifest_base directory. Doh.

Change-Id: Ic62f32f50012b9787773fb436ce50a616adf42f7
---
 tasks/main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index affcd4b..e68487a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,13 +26,6 @@
       mode: 0600
     with_items: hiera_file_paths.paths|default()
 
-  - name: ensure hieradata manifest link is present
-    file:
-      src: "{{ hieradata }}"
-      dest: "{{ manifest_base }}/hieradata"
-      state: link
-    when: manifest_base is defined
-
   when: copy_hieradata
 
 - block:
@@ -41,6 +34,13 @@
       src: "{{ manifest_base }}/{{ puppet_environment }}"
       dest: "{{ manifest_base }}"
 
+  - name: ensure hieradata manifest link is present
+    file:
+      src: "{{ hieradata }}"
+      dest: "{{ manifest_base }}/hieradata"
+      state: link
+    when: copy_hieradata
+
   - name: copy system puppet modules
     synchronize:
       src: /etc/puppet/modules