X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fglobal%2Fcommon.yaml;fp=environments%2Fintegration%2Fdata%2Fcommon.yaml;h=5b21dca75061bd0b0d3561dc50414e32178d563a;hb=a869ea173f9a1e45f63336ad9d640bf94e5039e3;hp=78cce6b6caef6797c4535e7cb76a0e1c1fb08069;hpb=56bc60ea5e9ae11872d3e3d388adb7c5ada0c2c9;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/environments/integration/data/common.yaml b/environments/global/common.yaml
similarity index 82%
rename from environments/integration/data/common.yaml
rename to environments/global/common.yaml
index 78cce6b..5b21dca 100644
--- a/environments/integration/data/common.yaml
+++ b/environments/global/common.yaml
@@ -1,4 +1,12 @@
 ---
+lookup_options:
+  base_installation::mounts:
+    merge: unique
+  classes:
+    merge: deep
+  base_installation::system_users:
+    merge: unique
+
 classes:
   stdlib: ~
 
@@ -7,6 +15,10 @@ base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae
 base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}"
 base_installation::ldap_server: "ldap.immae.eu"
 base_installation::ldap_uri: "ldaps://ldap.immae.eu"
+# FIXME: get all mounts without needing that hack?
+base_installation::mounts:
+  - "%{facts.ldapvar.self.vars.mounts.0}"
+  - "%{facts.ldapvar.self.vars.mounts.1}"
 base_installation::puppet_conf_path: "/etc/puppetlabs/puppet"
 base_installation::puppet_code_path: "/etc/puppetlabs/code"
 base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed"