From f711f9919567d89ec0b83ed0ac840cdbb490fdd2 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 28 Aug 2014 11:50:54 -0300
Subject: [PATCH] Using hiera.yaml from puppet folder

---
 puppet/bootstrap.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/puppet/bootstrap.py b/puppet/bootstrap.py
index 5058418..76c08f6 100644
--- a/puppet/bootstrap.py
+++ b/puppet/bootstrap.py
@@ -17,6 +17,7 @@ except ImportError:
 
 PUPPET_TARGET_VERSION = "3.6.2"
 PUPPET_DIR = os.path.join(os.path.dirname(__file__))
+HIERA_FILE = os.path.join(PUPPET_DIR, 'hiera.yaml')
 MODULES_FILE_PATH = os.path.join(PUPPET_DIR, 'modules.txt')
 
 DIST_CMD = {
@@ -188,8 +189,8 @@ def main():
             print('Failed installing puppet')
             exit(result)
 
-    if os.path.isfile('/vagrant/puppet/hiera.yaml'):
-        copyfile('/vagrant/puppet/hiera.yaml', '/etc/puppet/hiera.yaml')
+    if os.path.isfile(HIERA_FILE):
+        copyfile(HIERA_FILE, '/etc/puppet/hiera.yaml')
 
     install_puppet_modules()
 
--
libgit2 0.21.2