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:
parent
fe9ad5c0ea
commit
8d50410c04
@ -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
|
||||
|
@ -3,4 +3,4 @@
|
||||
copy_hieradata: false
|
||||
copy_puppet: false
|
||||
hieradata: /etc/puppet/hieradata
|
||||
hieraenvironment: production
|
||||
puppet_environment: production
|
||||
|
Loading…
x
Reference in New Issue
Block a user