summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2019-02-03 15:45:20 +0100
committerColleen Murphy <colleen@gazlene.net>2019-02-03 15:45:20 +0100
commitfe5255b56fdd24bd31327381aee59b5dd8a45f0a (patch)
tree43f19cd0f8b1267d2bcf46e1e8d83115cb425146
parent98b7ea710bd499ecbc2a7ccbb670d434f9168897 (diff)
Fix hieradata path for puppet 4HEADmaster
The datadir symlink points to /opt/system-config, but the private hieradata actually lies within /opt/system-config/hieradata. Change-Id: Iefedf1d733701c7abebd5022ca98993c5fcbd8a3
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 03 Feb 2019 15:54:58 +0000 Reviewed-on: https://review.openstack.org/634601 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--templates/hiera.yaml.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/hiera.yaml.j2 b/templates/hiera.yaml.j2
index 496fb5a..f325d0f 100644
--- a/templates/hiera.yaml.j2
+++ b/templates/hiera.yaml.j2
@@ -7,9 +7,9 @@
7 - "hieradata/%{::environment}/group_vars/%{group}" # no :: because group is set at nodescope 7 - "hieradata/%{::environment}/group_vars/%{group}" # no :: because group is set at nodescope
8 - "hieradata/%{::environment}/group_vars/all" 8 - "hieradata/%{::environment}/group_vars/all"
9 # Puppet4 paths 9 # Puppet4 paths
10 - "%{::environment}/hieradata/host_vars/%{::fqdn}" 10 - "hieradata/%{::environment}/hieradata/host_vars/%{::fqdn}"
11 - "%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope 11 - "hieradata/%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope
12 - "%{::environment}/hieradata/group_vars/all" 12 - "hieradata/%{::environment}/hieradata/group_vars/all"
13 # Use public hieradata second, also be environmentally aware. Keep this 13 # Use public hieradata second, also be environmentally aware. Keep this
14 # in the old structure so that we don't have to do a dance. There isn't much 14 # in the old structure so that we don't have to do a dance. There isn't much
15 # here, and it can be transferred piecemeal. 15 # here, and it can be transferred piecemeal.