aboutsummaryrefslogtreecommitdiff
path: root/modules/base_installation/manifests/init.pp
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 11:17:34 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 11:17:34 +0100
commit96d61e22a20255c2b437eb3a3b81f9b44a1814de (patch)
tree2fd1df3a6c0c34b87499b2606e0cd45faf5e6861 /modules/base_installation/manifests/init.pp
parent70c37c94e226a708fd0407a4b3742c83972967a7 (diff)
parenta869ea173f9a1e45f63336ad9d640bf94e5039e3 (diff)
downloadPuppet-96d61e22a20255c2b437eb3a3b81f9b44a1814de.tar.gz
Puppet-96d61e22a20255c2b437eb3a3b81f9b44a1814de.tar.zst
Puppet-96d61e22a20255c2b437eb3a3b81f9b44a1814de.zip
Merge branch 'fstabs' into dev
Add fstab, and reorganize hiera environments to avoid duplicates
Diffstat (limited to 'modules/base_installation/manifests/init.pp')
-rw-r--r--modules/base_installation/manifests/init.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/base_installation/manifests/init.pp b/modules/base_installation/manifests/init.pp
index 998f8ff..cb1cdda 100644
--- a/modules/base_installation/manifests/init.pp
+++ b/modules/base_installation/manifests/init.pp
@@ -6,6 +6,7 @@ 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,
9 Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path, 10 Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path,
10 Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path, 11 Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path,
11 Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed, 12 Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed,
@@ -30,4 +31,5 @@ class base_installation (
30 contain ::base_installation::users 31 contain ::base_installation::users
31 contain ::base_installation::package_managers 32 contain ::base_installation::package_managers
32 contain ::base_installation::puppet 33 contain ::base_installation::puppet
34 contain ::base_installation::fstab
33} 35}