From 8a0a0e9491818862feeb0b1cffa81fb2a35a176e Mon Sep 17 00:00:00 2001 From: Luca Filipozzi Date: Wed, 16 May 2012 09:12:07 +0000 Subject: [PATCH] try in template --- modules/puppetmaster/files/hiera.yaml | 2 ++ modules/ssh/templates/authorized_keys.erb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml index 98411f6c1..9304c0e46 100644 --- a/modules/puppetmaster/files/hiera.yaml +++ b/modules/puppetmaster/files/hiera.yaml @@ -1,6 +1,8 @@ --- :hierarchy: - %{hoster} + - machines/${fqdn} + - clusters/${cluster} - common :backends: - yaml diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index 23ee49b72..e0f97b48a 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -24,6 +24,9 @@ localkeys end ganetikeys %> +<% Puppet::Parser::Functions.function('hiera') -%> +<% Puppet::Parser::Functions.function('hiera_array') -%> +#<%= scope.function_hiera('cluster') %> # # DSA # -- 2.20.1