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
This commit is contained in:
Monty Taylor 2016-01-18 17:00:44 -05:00
parent fe9ad5c0ea
commit 8d50410c04
2 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
- name: ensure hiera directory - name: ensure hiera directory
file: file:
state: directory state: directory
path: "{{ hieradata }}/{{ hieraenvironment }}/{{ item }}" path: "{{ hieradata }}/{{ puppet_environment }}/{{ item }}"
owner: root owner: root
group: root group: root
mode: 0700 mode: 0700
@ -16,7 +16,7 @@
puppet_get_hiera_file_list: puppet_get_hiera_file_list:
fqdn: "{{ ansible_fqdn }}" fqdn: "{{ ansible_fqdn }}"
groups: "{{ hostvars[inventory_hostname].group_names }}" groups: "{{ hostvars[inventory_hostname].group_names }}"
location: "{{ hieradata }}/{{ hieraenvironment }}" location: "{{ hieradata }}/{{ puppet_environment }}"
delegate_to: localhost delegate_to: localhost
register: hiera_file_paths register: hiera_file_paths
@ -38,7 +38,7 @@
- block: - block:
- name: copy puppet modules - name: copy puppet modules
synchronize: synchronize:
src: "{{ manifest_base }}/{{ hieraenvironment }}" src: "{{ manifest_base }}/{{ puppet_environment }}"
dest: "{{ manifest_base }}" dest: "{{ manifest_base }}"
- name: copy system puppet modules - name: copy system puppet modules

View File

@ -3,4 +3,4 @@
copy_hieradata: false copy_hieradata: false
copy_puppet: false copy_puppet: false
hieradata: /etc/puppet/hieradata hieradata: /etc/puppet/hieradata
hieraenvironment: production puppet_environment: production