From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 28 Apr 2018 13:02:02 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4714b3c9cc8df06171cb0eb77943d1b79bcf1fc5;hp=a8b7bf42478079135595c221e4d03d5a8a62e1e8;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---

diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index fa2db69..3ca226a 100644
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -95,6 +95,11 @@ class base_installation::puppet (
       }
     }
 
+    if file("$base_installation::puppet_conf_path/host_ldap.info", "/dev/null") != "" and
+      empty($facts["ldapvar"]) {
+        fail("LDAP was activated but facts are not available")
+    }
+
     $ips = lookup("ips", { 'default_value' => undef })
     file { "$base_installation::puppet_conf_path/host_ldap.info":
       content => template("base_installation/puppet/host_ldap.info.erb"),