opendev/ansible-role-puppet
Code Issues Proposed changes

Merge "Add ability to override mgmt manifest path"

Browse Source
This commit is contained in:
Zuul 2018-08-17 17:45:44 +00:00 committed by Gerrit Code Review
commit 6e8b8a56b9
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

@ -17,3 +17,4 @@ puppet_environment_basedir: '/opt/system-config/'
puppet_environment: production puppet_environment: production
puppet_timeout: 30m puppet_timeout: 30m
futureparser: False futureparser: False
mgmt_manifestpath: '{{ manifest_base }}/{{ puppet_environment }}'

2
tasks/main.yaml
View File

@ -76,7 +76,7 @@
- name: copy puppet modules - name: copy puppet modules
synchronize: synchronize:
src: "{{ manifest_base }}/{{ puppet_environment }}" src: "{{ mgmt_manifestpath }}"
dest: "{{ manifest_base }}" dest: "{{ manifest_base }}"
- name: ensure hieradata manifest link is present - name: ensure hieradata manifest link is present