diff options
Diffstat (limited to 'modules/base_installation/templates')
4 files changed, 5 insertions, 3 deletions
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 | |||
6 | objectclass: top | 6 | objectclass: top |
7 | objectclass: simpleSecurityObject | 7 | objectclass: simpleSecurityObject |
8 | objectclass: puppetClient | 8 | objectclass: puppetClient |
9 | <%- unless @ips.empty? -%> | 9 | <%- unless @ips.nil? || @ips.empty? -%> |
10 | objectclass: ipHost | 10 | objectclass: ipHost |
11 | <% unless @ips["v4"].nil? -%>ipHostNumber: <%= @ips["v4"]["ipAddress"] %><%- end %> | 11 | <% unless @ips["v4"].nil? -%>ipHostNumber: <%= @ips["v4"]["ipAddress"] %><%- end %> |
12 | <% unless @ips["v6"].nil? -%>ipHostNumber: <%= @ips["v6"]["ipAddress"] %>/<%= @ips["v6"]["mask"] %><%- end %> | 12 | <% 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 | |||
7 | - | 7 | - |
8 | replace: environment | 8 | replace: environment |
9 | environment: <%= @environment %> | 9 | environment: <%= @environment %> |
10 | <%- unless @ips.empty? -%> | 10 | <%- unless @ips.nil? || @ips.empty? -%> |
11 | - | 11 | - |
12 | delete: ipHostNumber | 12 | delete: ipHostNumber |
13 | <%- unless @ips["v4"].nil? -%> | 13 | <%- 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 %> | |||
16 | 16 | ||
17 | environment = <%= @environment %> | 17 | environment = <%= @environment %> |
18 | 18 | ||
19 | <% if @ldap_enabled %> | ||
19 | node_terminus = ldap | 20 | node_terminus = ldap |
20 | certname = <%= @real_hostname %> | 21 | certname = <%= @real_hostname %> |
21 | ldapserver = <%= @ldap_server %> | 22 | ldapserver = <%= @ldap_server %> |
@@ -26,3 +27,4 @@ ldappassword = <%= @ldap_password %> | |||
26 | ldapclassattrs = puppetClass | 27 | ldapclassattrs = puppetClass |
27 | ldapparentattr = parentNode | 28 | ldapparentattr = parentNode |
28 | ldapstackedattrs = puppetVar | 29 | ldapstackedattrs = puppetVar |
30 | <% 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* | |||
4 | [Network] | 4 | [Network] |
5 | DHCP=ipv4 | 5 | DHCP=ipv4 |
6 | 6 | ||
7 | <%- unless @ip6.empty? -%> | 7 | <%- unless @ip6.nil? || @ip6.empty? -%> |
8 | Gateway=<%= @ip6["gateway"] %> | 8 | Gateway=<%= @ip6["gateway"] %> |
9 | 9 | ||
10 | [Address] | 10 | [Address] |