opendev/ansible-role-puppet
Code Issues Proposed changes

Merge "Allow overiding the remote hieradata link dest"

Browse Source
This commit is contained in:
Zuul 2018-08-17 20:44:43 +00:00 committed by Gerrit Code Review
commit a0ce4c7317
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -18,3 +18,4 @@ puppet_environment: production
puppet_timeout: 30m puppet_timeout: 30m
futureparser: False futureparser: False
mgmt_manifestpath: '{{ manifest_base }}/{{ puppet_environment }}' mgmt_manifestpath: '{{ manifest_base }}/{{ puppet_environment }}'
puppet_hieradata_link_dest: '{{ manifest_base }}/hieradata'

2
tasks/main.yaml
View File

@ -82,7 +82,7 @@
- name: ensure hieradata manifest link is present - name: ensure hieradata manifest link is present
file: file:
src: "{{ '/etc/puppet/hieradata' if puppet_version == '3' else '/etc/puppetlabs/code/environments' }}" src: "{{ '/etc/puppet/hieradata' if puppet_version == '3' else '/etc/puppetlabs/code/environments' }}"
dest: "{{ manifest_base }}/hieradata" dest: "{{ puppet_hieradata_link_dest }}"
state: link state: link
when: copy_hieradata when: copy_hieradata