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 /environments | |
parent | a55a5e4aa468d550fcdf5bbeafe42dea13773e37 (diff) | |
download | Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.tar.gz Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.tar.zst Puppet-f25ad097f24e0d39d5dd9ac2cef39760e671e08f.zip |
Don’t mount unavailables mounts
Diffstat (limited to 'environments')
-rw-r--r-- | environments/global/common.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ | |||
1 | --- | 1 | --- |
2 | lookup_options: | 2 | lookup_options: |
3 | base_installation::mounts: | 3 | profile::fstab::mounts: |
4 | merge: unique | 4 | merge: unique |
5 | classes: | 5 | classes: |
6 | merge: deep | 6 | merge: deep |
@@ -22,9 +22,6 @@ base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" | |||
22 | base_installation::ldap_server: "ldap.immae.eu" | 22 | base_installation::ldap_server: "ldap.immae.eu" |
23 | base_installation::ldap_uri: "ldaps://ldap.immae.eu" | 23 | base_installation::ldap_uri: "ldaps://ldap.immae.eu" |
24 | # FIXME: get all mounts without needing that hack? | 24 | # FIXME: get all mounts without needing that hack? |
25 | base_installation::mounts: | ||
26 | - "%{facts.ldapvar.self.vars.mounts.0}" | ||
27 | - "%{facts.ldapvar.self.vars.mounts.1}" | ||
28 | base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" | 25 | base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" |
29 | base_installation::puppet_code_path: "/etc/puppetlabs/code" | 26 | base_installation::puppet_code_path: "/etc/puppetlabs/code" |
30 | base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" | 27 | base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" |
@@ -32,6 +29,9 @@ base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" | |||
32 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] | 29 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] |
33 | base_installation::system_timezone: "Europe/Paris" | 30 | base_installation::system_timezone: "Europe/Paris" |
34 | base_installation::system_users: [] # Fetched via ldap | 31 | base_installation::system_users: [] # Fetched via ldap |
32 | profile::fstab::mounts: | ||
33 | - "%{facts.ldapvar.self.vars.mounts.0}" | ||
34 | - "%{facts.ldapvar.self.vars.mounts.1}" | ||
35 | profile::xmr_stak::mining_pool: "" # Fetched via ldap | 35 | profile::xmr_stak::mining_pool: "" # Fetched via ldap |
36 | profile::xmr_stak::wallet: "" # Fetched via ldap | 36 | profile::xmr_stak::wallet: "" # Fetched via ldap |
37 | profile::mail::mailhub: "" # Fetched via ldap | 37 | profile::mail::mailhub: "" # Fetched via ldap |