Don’t mount unavailables mounts

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

diff --git a/modules/base_installation/manifests/init.pp b/modules/base_installation/manifests/init.pp
index cb1cdda74808093bfebc72ab72c2095359dc2d6b..998f8ff137015a497828de28165a93d45ba2b285 100644 (file)
--- a/modules/base_installation/manifests/init.pp
+++ b/modules/base_installation/manifests/init.pp
@@ -6,7 +6,6 @@ class base_installation (
   Optional[String]        $ldap_dn          = $base_installation::params::ldap_dn,
   Optional[String]        $ldap_server      = $base_installation::params::ldap_server,
   Optional[String]        $ldap_uri         = $base_installation::params::ldap_uri,
-  Optional[Array[String]] $mounts           = $base_installation::params::mounts,
   Optional[String]        $puppet_code_path = $base_installation::params::puppet_code_path,
   Optional[String]        $puppet_conf_path = $base_installation::params::puppet_conf_path,
   Optional[String]        $puppet_pass_seed = $base_installation::params::puppet_pass_seed,
@@ -31,5 +30,4 @@ class base_installation (
   contain ::base_installation::users
   contain ::base_installation::package_managers
   contain ::base_installation::puppet
-  contain ::base_installation::fstab
 }

diff --git a/modules/base_installation/manifests/params.pp b/modules/base_installation/manifests/params.pp
index 2a9fe6a6be21bf9f34d9f02b5cc74edcaf087403..5ade838ae0b70430a9ad2b9a6ea2428dcfb86ad0 100644 (file)
--- a/modules/base_installation/manifests/params.pp
+++ b/modules/base_installation/manifests/params.pp
@@ -10,7 +10,6 @@ class base_installation::params {
   $ldap_cert_path   = "/etc/ssl/certs/ca-certificates.crt"
   $ldap_uri         = "ldaps://ldap.example.com"
   $ldap_server      = "ldap.example.com"
-  $mounts           = []
   $real_hostname    = "example.com"
   $system_hostname  = "example.com"
   $system_locales   = ["en_US.UTF-8"]

diff --git a/modules/base_installation/manifests/fstab.pp b/modules/profile/manifests/fstab.pp
similarity index 73%
rename from modules/base_installation/manifests/fstab.pp
rename to modules/profile/manifests/fstab.pp
index f012e76f26a8c4a587539625e20a3bb582171702..5f2e58e2d9a2c3a45f25c902200529c0def2df20 100644 (file)
--- a/modules/base_installation/manifests/fstab.pp
+++ b/modules/profile/manifests/fstab.pp
@@ -1,6 +1,6 @@
-class base_installation::fstab (
-  $mounts = $base_installation::mounts
-) inherits base_installation {
+class profile::fstab (
+  Optional[Array] $mounts = []
+) {
   $mounts.each |$mount| {
     unless empty($mount) {
       $infos = split($mount, ';')

diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp
index edfd5e0f83f530a4e28f3ca2d5d33567f131c478..d7ba4867381e9c6c72b77fea7d18d6490ac793f2 100644 (file)
--- a/modules/role/manifests/backup.pp
+++ b/modules/role/manifests/backup.pp
@@ -8,6 +8,7 @@ class role::backup (
 ) {
   include "base_installation"
 
+  include "profile::fstab"
   include "profile::mail"
   include "profile::tools"
   include "profile::xmr_stak"