Upgrade bot and front version

[perso/Immae/Projets/Puppet.git] / environments / production / hiera.yaml

diff --git a/environments/production/hiera.yaml b/environments/production/hiera.yaml
index 095a110f60e211835ca0dce0bda7398718c96046..9cedf4782183e0fda9246de2d00e2f292cfb536b 100644 (file)
--- a/environments/production/hiera.yaml
+++ b/environments/production/hiera.yaml
@@ -6,11 +6,20 @@ defaults:
   data_hash: yaml_data
 
 hierarchy:
+# FIXME: those informations should be taken in LDAP, but bootstrap
+# problem for the hostname
+  - name: "Per-named-node data"
+    mapped_paths: [ldapvar.self.cn, hostname, "named_nodes/%{hostname}.yaml"]
+
   - name: "Per-node data"
     path: "nodes/%{facts.ec2_metadata.hostname}.yaml"
+### /FIXME
+
+  - name: "Initialization variables"
+    path: "/root/puppet_variables.json"
 
   - name: "Per-role data"
-    mapped_paths: [roles, role, "roles/%{role}.yaml"]
+    mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"]
 
   - name: "Per-type data"
     path: "types/%{facts.ec2_metadata.instance-type}.yaml"