summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2018-04-25 11:09:33 -0700
committerClark Boylan <clark.boylan@gmail.com>2018-04-25 11:32:57 -0700
commitc95f026c14f44c4766cfca86da00e4a31bd0fa59 (patch)
treef7fcc1a937017edff30449e0c849a6eca7d34047
parentd5dbfc3a62d0e12cf47dc723463a85e5ea693a8b (diff)
Add some missing /'s and +'s to fix hieradata pathing
These were missed when the puppet4 support was added. Change-Id: I7f7153093aaf46d5bbdb620228cf1c7fce3650e1
Notes
Notes (review): Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 25 Apr 2018 20:34:29 +0000 Reviewed-on: https://review.openstack.org/564305 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/tasks/main.yml b/tasks/main.yml
index 3882a10..89e4dc3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,17 +29,17 @@
29- block: 29- block:
30 - name: Set management server hieradata var 30 - name: Set management server hieradata var
31 set_fact: 31 set_fact:
32 mgmt_hieradata: "{{ '/etc/puppet/hieradata' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" 32 mgmt_hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
33 delegate_to: localhost 33 delegate_to: localhost
34 34
35 - name: Set hieradata var 35 - name: Set hieradata var
36 set_fact: 36 set_fact:
37 hieradata: "{{ '/etc/puppet/hieradata' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" 37 hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
38 38
39 - name: ensure hiera directory 39 - name: ensure hiera directory
40 file: 40 file:
41 state: directory 41 state: directory
42 path: "{{ hieradata }}//{{ item }}" 42 path: "{{ hieradata }}/{{ item }}"
43 owner: root 43 owner: root
44 group: root 44 group: root
45 mode: 0700 45 mode: 0700
@@ -58,7 +58,7 @@
58 - name: copy hiera files 58 - name: copy hiera files
59 copy: 59 copy:
60 src: "{{ mgmt_hieradata + '/' + item }}" 60 src: "{{ mgmt_hieradata + '/' + item }}"
61 dest: "{{ hieradata + '/' item }}" 61 dest: "{{ hieradata + '/' + item }}"
62 mode: 0600 62 mode: 0600
63 with_items: "{{ hiera_file_paths.paths|default() }}" 63 with_items: "{{ hiera_file_paths.paths|default() }}"
64 64