From f73c16bca2f960b2fa351b38e6a1b80865a5792f Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 11 Nov 2023 00:03:12 +1100 Subject: [PATCH] feat: add enc_role_path fact --- hiera.yaml | 14 +++++++++----- site/profiles/templates/base/facts/enc_role.erb | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hiera.yaml b/hiera.yaml index c601683..d117ebd 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -5,10 +5,14 @@ defaults: data_hash: "yaml_data" hierarchy: - name: Node-specific data - path: "nodes/%{trusted.certname}.yaml" - - name: "Per-OS & Release Specific Data" - path: "os/%{facts.os.name}/%{facts.os.name}%{facts.os.release.major}.yaml" - - name: "Per-OS Specific Data" - path: "os/%{facts.os.name}/all_releases.yaml" + paths: + - "nodes/%{trusted.certname}.yaml" + - name: Role-specific data + paths: + - "%{facts.enc_role_path}.yaml" + - name: "OS Related" + paths: + - "os/%{facts.os.name}/%{facts.os.name}%{facts.os.release.major}.yaml" + - "os/%{facts.os.name}/all_releases.yaml" - name: Common data shared across nodes path: "common.yaml" diff --git a/site/profiles/templates/base/facts/enc_role.erb b/site/profiles/templates/base/facts/enc_role.erb index d59acdf..dbef811 100644 --- a/site/profiles/templates/base/facts/enc_role.erb +++ b/site/profiles/templates/base/facts/enc_role.erb @@ -1 +1,2 @@ enc_role=<%= @enc_role[0] %> +enc_role_path=<%= @enc_role[0].gsub('::', '/') %>