opendev
/
ansible-role-puppet
Code Issues Proposed changes

Add some missing /'s and +'s to fix hieradata pathing 

These were missed when the puppet4 support was added.

Change-Id: I7f7153093aaf46d5bbdb620228cf1c7fce3650e1
This commit is contained in:
Clark Boylan 2018-04-25 11:09:33 -07:00
parent d5dbfc3a62
commit c95f026c14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/main.yml
View File

@ -29,17 +29,17 @@
- block: - block:
- name: Set management server hieradata var - name: Set management server hieradata var
set_fact: set_fact:
mgmt_hieradata: "{{ '/etc/puppet/hieradata' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" mgmt_hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
delegate_to: localhost delegate_to: localhost
- name: Set hieradata var - name: Set hieradata var
set_fact: set_fact:
hieradata: "{{ '/etc/puppet/hieradata' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
- name: ensure hiera directory - name: ensure hiera directory
file: file:
state: directory state: directory
path: "{{ hieradata }}//{{ item }}" path: "{{ hieradata }}/{{ item }}"
owner: root owner: root
group: root group: root
mode: 0700 mode: 0700
@ -58,7 +58,7 @@
- name: copy hiera files - name: copy hiera files
copy: copy:
src: "{{ mgmt_hieradata + '/' + item }}" src: "{{ mgmt_hieradata + '/' + item }}"
dest: "{{ hieradata + '/' item }}" dest: "{{ hieradata + '/' + item }}"
mode: 0600 mode: 0600
with_items: "{{ hiera_file_paths.paths|default() }}" with_items: "{{ hiera_file_paths.paths|default() }}"