Skip to content

Commit 7f75bb3

Browse files
committed
Fixes #39653 - Remove Puppet 6 references
Puppet 6 reached EOL in 2023. Remove its host parameters, repository setup, package references, and documentation from provisioning templates. Use Puppet 8 unconditionally on FreeBSD and update the documented minimum version to Puppet 7. Assisted-By: Codex 5.6 Sol High
1 parent ea5e85c commit 7f75bb3

11 files changed

Lines changed: 13 additions & 19 deletions

app/views/unattended/provisioning_templates/cloud_init/cloud_init_default.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ description: |
2121
This template accepts the following parameters:
2222
- force-puppet: boolean (default=false)
2323
- enable-puppetlabs-repo: boolean (default=false)
24-
- enable-puppetlabs-puppet6-repo: boolean (default=false)
2524
- enable-official-puppet7-repo: boolean (default=false)
2625
- enable-official-puppet8-repo: boolean (default=false)
2726
- skip-puppet-setup: boolean (default=false)
@@ -73,7 +72,7 @@ runcmd:
7372
<% end -%>
7473
<% if puppet_enabled -%>
7574
- |
76-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
75+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
7776
<%= indent(2) { snippet 'puppetlabs_repo' } %>
7877
<% end -%>
7978
<%= indent(2) { snippet 'puppet_setup' } %>

app/views/unattended/provisioning_templates/finish/kickstart_default_finish.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ chmod +x /root/remote_execution_pull_setup.sh
7878
<% end -%>
7979

8080
<% if puppet_enabled %>
81-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
81+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
8282
<%= snippet 'puppetlabs_repo' %>
8383
<% end -%>
8484
<%= snippet 'puppet_setup' %>

app/views/unattended/provisioning_templates/finish/preseed_default_finish.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e
7272
<% end -%>
7373
<% if puppet_enabled -%>
7474

75-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
75+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
7676
<%= snippet 'puppetlabs_repo' %>
7777
<% end -%>
7878
<%= snippet 'puppet_setup' %>

app/views/unattended/provisioning_templates/provision/autoyast_sles_default.erb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ description: |
1111
os_major = @host.operatingsystem.major.to_i
1212
os_minor = @host.operatingsystem.minor.to_i
1313
# safemode renderer does not support unary negation
14-
aio_enabled = host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6')
14+
aio_enabled = host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7')
1515
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
1616
salt_enabled = host_param('salt_master') ? true : false
1717
sles_minor_string = (os_minor == 0) ? '' : "_SP#{os_minor}"
@@ -303,15 +303,13 @@ rm /etc/resolv.conf
303303
<% end -%>
304304
<% end -%>
305305
<% if puppet_enabled -%>
306-
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
306+
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
307307
<%
308308
puppet_repo_url_base = 'http://yum.puppet.com'
309309
if host_param_true?('enable-official-puppet8-repo')
310310
puppet_repo_url = "#{puppet_repo_url_base}/puppet8/sles/#{os_major}/#{@host.architecture}/"
311311
elsif host_param_true?('enable-official-puppet7-repo')
312312
puppet_repo_url = "#{puppet_repo_url_base}/puppet7/sles/#{os_major}/#{@host.architecture}/"
313-
elsif host_param_true?('enable-puppetlabs-puppet6-repo')
314-
puppet_repo_url = "#{puppet_repo_url_base}/puppet6/sles/#{os_major}/#{@host.architecture}/"
315313
end
316314
%>
317315
<listentry>

app/views/unattended/provisioning_templates/provision/kickstart_default.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ description: |
3434
- force-puppet: boolean (default=false)
3535
- enable-epel: boolean (default=false)
3636
- enable-puppetlabs-repo: boolean (default=false)
37-
- enable-puppetlabs-puppet6-repo: boolean (default=false)
3837
- enable-official-puppet7-repo: boolean (default=false)
3938
- enable-official-puppet8-repo: boolean (default=false)
4039
- skip-puppet-setup: boolean (default=false)
@@ -304,7 +303,7 @@ chmod +x /root/remote_execution_pull_setup.sh
304303
<% end -%>
305304

306305
<% if puppet_enabled %>
307-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
306+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
308307
<%= snippet 'puppetlabs_repo' %>
309308
<% end -%>
310309
<%= snippet 'puppet_setup' %>

app/views/unattended/provisioning_templates/snippet/puppet.conf.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ snippet: true
66
description: |
77
Generates a puppet.conf file which is required for the puppet agent bootstraping.
88
The puppet server and CA is configured based on the host configuration. It supports
9-
Puppet 6 and newer. Supports hostcert_renewal_interval for Puppet 8+.
9+
Puppet 7 and newer. Supports hostcert_renewal_interval for Puppet 8+.
1010
-%>
1111
<%
1212
os_family = @host.operatingsystem.family
1313
os_name = @host.operatingsystem.name
1414

15-
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6')
15+
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7')
1616
aio_available = os_family == 'Debian' || os_family == 'Redhat' || os_family == 'Suse'
1717

1818
if os_family == 'Windows'

app/views/unattended/provisioning_templates/snippet/puppet_setup.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ os_family = @host.operatingsystem.family
1717
os_major = @host.operatingsystem.major.to_i
1818
os_name = @host.operatingsystem.name
1919

20-
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6')
20+
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7')
2121
aio_openvox_enabled = host_param_true?('enable-openvox7') || host_param_true?('enable-openvox8')
2222

2323
if host_param('run-puppet-in-installer-tags')
@@ -27,7 +27,7 @@ else
2727
end
2828

2929
if os_family == 'Freebsd'
30-
freebsd_package = host_param_true?('enable-puppet6') ? 'puppet6' : 'puppet8'
30+
freebsd_package = 'puppet8'
3131
etc_path = '/usr/local/etc/puppet'
3232
bin_path = '/usr/local/bin'
3333
elsif os_family == 'Windows'

app/views/unattended/provisioning_templates/snippet/puppetlabs_repo.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ elsif host_param_true?('enable-official-puppet8-repo')
4242
repo_name = 'puppet8-release'
4343
elsif host_param_true?('enable-official-puppet7-repo')
4444
repo_name = 'puppet7-release'
45-
elsif host_param_true?('enable-puppetlabs-puppet6-repo')
46-
repo_name = 'puppet6-release'
4745
end
4846
-%>
4947
<% if repo_name -%>

app/views/unattended/provisioning_templates/user_data/autoyast_default_user_data.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e
3131
<%= snippet "blacklist_kernel_modules" %>
3232

3333
<% if puppet_enabled %>
34-
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
34+
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
3535
<%= snippet 'puppetlabs_repo' %>
3636
<% end -%>
3737
<%= snippet 'puppet_setup' %>

app/views/unattended/provisioning_templates/user_data/kickstart_default_user_data.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363
<% end -%>
6464

6565
<% if puppet_enabled %>
66-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
66+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
6767
<%= snippet 'puppetlabs_repo' %>
6868
<% end -%>
6969
<%= snippet 'puppet_setup' %>

0 commit comments

Comments
 (0)