From fe5255b56fdd24bd31327381aee59b5dd8a45f0a Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Sun, 3 Feb 2019 15:45:20 +0100 Subject: [PATCH] Fix hieradata path for puppet 4 The datadir symlink points to /opt/system-config, but the private hieradata actually lies within /opt/system-config/hieradata. Change-Id: Iefedf1d733701c7abebd5022ca98993c5fcbd8a3 --- templates/hiera.yaml.j2 | 6 +++--- 1 file 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 @@ - "hieradata/%{::environment}/group_vars/%{group}" # no :: because group is set at nodescope - "hieradata/%{::environment}/group_vars/all" # Puppet4 paths - - "%{::environment}/hieradata/host_vars/%{::fqdn}" - - "%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope - - "%{::environment}/hieradata/group_vars/all" + - "hieradata/%{::environment}/hieradata/host_vars/%{::fqdn}" + - "hieradata/%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope + - "hieradata/%{::environment}/hieradata/group_vars/all" # Use public hieradata second, also be environmentally aware. Keep this # in the old structure so that we don't have to do a dance. There isn't much # here, and it can be transferred piecemeal.