From 8d50410c04ca496161cbb14fbe0e152b61be1a77 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 18 Jan 2016 17:00:44 -0500
Subject: [PATCH] Rename hieraenvironment to puppet_environment

It's actually a puppet environment, not a hiera environment. So let's
call it that, otherwise nibalizer will be sad.

Change-Id: I0175596329e9f7eb7a079513bfa17dd18d53b753
---
 tasks/main.yml | 6 +++---
 vars/main.yml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 6cbe883..7043eaf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
   - name: ensure hiera directory
     file:
       state: directory
-      path: "{{ hieradata }}/{{ hieraenvironment }}/{{ item }}"
+      path: "{{ hieradata }}/{{ puppet_environment }}/{{ item }}"
       owner: root
       group: root
       mode: 0700
@@ -16,7 +16,7 @@
     puppet_get_hiera_file_list:
       fqdn: "{{ ansible_fqdn }}"
       groups: "{{ hostvars[inventory_hostname].group_names }}"
-      location: "{{ hieradata }}/{{ hieraenvironment }}"
+      location: "{{ hieradata }}/{{ puppet_environment }}"
     delegate_to: localhost
     register: hiera_file_paths
 
@@ -38,7 +38,7 @@
 - block:
   - name: copy puppet modules
     synchronize:
-      src: "{{ manifest_base }}/{{ hieraenvironment }}"
+      src: "{{ manifest_base }}/{{ puppet_environment }}"
       dest: "{{ manifest_base }}"
 
   - name: copy system puppet modules
diff --git a/vars/main.yml b/vars/main.yml
index 2701e0c..5ebc5ab 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -3,4 +3,4 @@
 copy_hieradata: false
 copy_puppet: false
 hieradata: /etc/puppet/hieradata
-hieraenvironment: production
+puppet_environment: production