From 98a071604ea9f7569aa0fa0688bc9d35081770c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 2 Oct 2018 22:53:29 +0200
Subject: Add Flony workstation

---
 modules/base_installation/templates/puppet/host_ldap_add_top.info.erb | 2 +-
 modules/base_installation/templates/puppet/host_ldap_mod_top.info.erb | 2 +-
 modules/base_installation/templates/puppet/puppet.conf.erb            | 2 ++
 modules/base_installation/templates/services/en-dhcp.network.erb      | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/base_installation/templates')

diff --git a/modules/base_installation/templates/puppet/host_ldap_add_top.info.erb b/modules/base_installation/templates/puppet/host_ldap_add_top.info.erb
index 3aafc19..544f445 100644
--- a/modules/base_installation/templates/puppet/host_ldap_add_top.info.erb
+++ b/modules/base_installation/templates/puppet/host_ldap_add_top.info.erb
@@ -6,7 +6,7 @@ objectclass: device
 objectclass: top
 objectclass: simpleSecurityObject
 objectclass: puppetClient
-<%- unless @ips.empty? -%>
+<%- unless @ips.nil? || @ips.empty? -%>
 objectclass: ipHost
 <% unless @ips["v4"].nil? -%>ipHostNumber: <%= @ips["v4"]["ipAddress"] %><%- end %>
 <% unless @ips["v6"].nil? -%>ipHostNumber: <%= @ips["v6"]["ipAddress"] %>/<%= @ips["v6"]["mask"] %><%- end %>
diff --git a/modules/base_installation/templates/puppet/host_ldap_mod_top.info.erb b/modules/base_installation/templates/puppet/host_ldap_mod_top.info.erb
index d7a1294..b1a4906 100644
--- a/modules/base_installation/templates/puppet/host_ldap_mod_top.info.erb
+++ b/modules/base_installation/templates/puppet/host_ldap_mod_top.info.erb
@@ -7,7 +7,7 @@ userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha
 -
 replace: environment
 environment: <%= @environment %>
-<%- unless @ips.empty? -%>
+<%- unless @ips.nil? || @ips.empty? -%>
 -
 delete: ipHostNumber
 <%- unless @ips["v4"].nil? -%>
diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb
index 38a0c1b..4233b86 100644
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -16,6 +16,7 @@ ssldir = <%= @puppet_ssl_path %>
 
 environment = <%= @environment %>
 
+<% if @ldap_enabled %>
 node_terminus = ldap
 certname = <%= @real_hostname %>
 ldapserver = <%= @ldap_server %>
@@ -26,3 +27,4 @@ ldappassword = <%= @ldap_password %>
 ldapclassattrs = puppetClass
 ldapparentattr = parentNode
 ldapstackedattrs = puppetVar
+<% end %>
diff --git a/modules/base_installation/templates/services/en-dhcp.network.erb b/modules/base_installation/templates/services/en-dhcp.network.erb
index 0255595..98cb446 100644
--- a/modules/base_installation/templates/services/en-dhcp.network.erb
+++ b/modules/base_installation/templates/services/en-dhcp.network.erb
@@ -4,7 +4,7 @@ Name=en*
 [Network]
 DHCP=ipv4
 
-<%- unless @ip6.empty? -%>
+<%- unless @ip6.nil? || @ip6.empty? -%>
 Gateway=<%= @ip6["gateway"] %>
 
 [Address]
-- 
cgit v1.2.3