Don’t mount unavailables mounts

[perso/Immae/Projets/Puppet.git] / environments / global / common.yaml

diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 4836f6ed88e2f6109188601eb33c905dfb8a83e6..094e0fff4c04c15a307951d334109fda8fcc483e 100644 (file)
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -1,6 +1,6 @@
 ---
 lookup_options:
-  base_installation::mounts:
+  profile::fstab::mounts:
     merge: unique
   classes:
     merge: deep
@@ -22,9 +22,6 @@ 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"
@@ -32,6 +29,9 @@ base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl"
 base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
 base_installation::system_timezone: "Europe/Paris"
 base_installation::system_users: [] # Fetched via ldap
+profile::fstab::mounts:
+  - "%{facts.ldapvar.self.vars.mounts.0}"
+  - "%{facts.ldapvar.self.vars.mounts.1}"
 profile::xmr_stak::mining_pool: "" # Fetched via ldap
 profile::xmr_stak::wallet: "" # Fetched via ldap
 profile::mail::mailhub: "" # Fetched via ldap