diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 17:13:37 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 18:11:32 +0100 |
commit | f25ad097f24e0d39d5dd9ac2cef39760e671e08f (patch) | |
tree | b04d72ebb169e7d21285aafd807c83bd6e0d813d /modules/base_installation | |
parent | a55a5e4aa468d550fcdf5bbeafe42dea13773e37 (diff) | |
download | Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.tar.gz Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.tar.zst Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.zip |
Don’t mount unavailables mounts
Diffstat (limited to 'modules/base_installation')
-rw-r--r-- | modules/base_installation/manifests/fstab.pp | 18 | ||||
-rw-r--r-- | modules/base_installation/manifests/init.pp | 2 | ||||
-rw-r--r-- | modules/base_installation/manifests/params.pp | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/modules/base_installation/manifests/fstab.pp b/modules/base_installation/manifests/fstab.pp deleted file mode 100644 index f012e76..0000000 --- a/modules/base_installation/manifests/fstab.pp +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | class base_installation::fstab ( | ||
2 | $mounts = $base_installation::mounts | ||
3 | ) inherits base_installation { | ||
4 | $mounts.each |$mount| { | ||
5 | unless empty($mount) { | ||
6 | $infos = split($mount, ';') | ||
7 | |||
8 | file { $infos[0]: | ||
9 | ensure => directory, | ||
10 | } -> | ||
11 | mount { $infos[0]: | ||
12 | ensure => mounted, | ||
13 | device => "UUID=${infos[1]}", | ||
14 | fstype => $infos[2] | ||
15 | } | ||
16 | } | ||
17 | } | ||
18 | } | ||
diff --git a/modules/base_installation/manifests/init.pp b/modules/base_installation/manifests/init.pp index cb1cdda..998f8ff 100644 --- a/modules/base_installation/manifests/init.pp +++ b/modules/base_installation/manifests/init.pp | |||
@@ -6,7 +6,6 @@ class base_installation ( | |||
6 | Optional[String] $ldap_dn = $base_installation::params::ldap_dn, | 6 | Optional[String] $ldap_dn = $base_installation::params::ldap_dn, |
7 | Optional[String] $ldap_server = $base_installation::params::ldap_server, | 7 | Optional[String] $ldap_server = $base_installation::params::ldap_server, |
8 | Optional[String] $ldap_uri = $base_installation::params::ldap_uri, | 8 | Optional[String] $ldap_uri = $base_installation::params::ldap_uri, |
9 | Optional[Array[String]] $mounts = $base_installation::params::mounts, | ||
10 | Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path, | 9 | Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path, |
11 | Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path, | 10 | Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path, |
12 | Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed, | 11 | Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed, |
@@ -31,5 +30,4 @@ class base_installation ( | |||
31 | contain ::base_installation::users | 30 | contain ::base_installation::users |
32 | contain ::base_installation::package_managers | 31 | contain ::base_installation::package_managers |
33 | contain ::base_installation::puppet | 32 | contain ::base_installation::puppet |
34 | contain ::base_installation::fstab | ||
35 | } | 33 | } |
diff --git a/modules/base_installation/manifests/params.pp b/modules/base_installation/manifests/params.pp index 2a9fe6a..5ade838 100644 --- a/modules/base_installation/manifests/params.pp +++ b/modules/base_installation/manifests/params.pp | |||
@@ -10,7 +10,6 @@ class base_installation::params { | |||
10 | $ldap_cert_path = "/etc/ssl/certs/ca-certificates.crt" | 10 | $ldap_cert_path = "/etc/ssl/certs/ca-certificates.crt" |
11 | $ldap_uri = "ldaps://ldap.example.com" | 11 | $ldap_uri = "ldaps://ldap.example.com" |
12 | $ldap_server = "ldap.example.com" | 12 | $ldap_server = "ldap.example.com" |
13 | $mounts = [] | ||
14 | $real_hostname = "example.com" | 13 | $real_hostname = "example.com" |
15 | $system_hostname = "example.com" | 14 | $system_hostname = "example.com" |
16 | $system_locales = ["en_US.UTF-8"] | 15 | $system_locales = ["en_US.UTF-8"] |