From f25ad097f24e0d39d5dd9ac2cef39760e671e08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 19 Mar 2018 17:13:37 +0100 Subject: =?UTF-8?q?Don=E2=80=99t=20mount=20unavailables=20mounts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environments/global/common.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'environments') diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 4836f6e..094e0ff 100644 --- 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 -- cgit v1.2.3