Skip to content

Commit d86340d

Browse files
committed
Fixes #39654 - Remove Puppet 7 references
Puppet 7 reached EOL in 2025. Remove its host parameters, repository setup, and documentation from provisioning templates, leaving Puppet 8 as the supported version. Correct the Puppet 8 SLES repository URL while simplifying the remaining version selection. Assisted-By: Codex 5.6 Sol High
1 parent c88252a commit d86340d

13 files changed

Lines changed: 15 additions & 27 deletions

File tree

app/services/foreman/renderer/scope/macros/host_template.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module HostTemplate
1515
list :path, 'List of strings representing path to a parameter to be returned'
1616
raises error: HostENCParamUndefined, desc: "when the parameter is not set in host's ENC output"
1717
returns one_of: [Hash, Object], desc: 'The value of a parameter or a key=value object with all information from ENC'
18-
example "host_enc('parameters', 'enable-puppet7') #=> true"
18+
example "host_enc('parameters', 'enable-puppet8') #=> true"
1919
example 'host_enc #=> {"parameters"=>{...}'
2020
end
2121
def host_enc(*path)

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-official-puppet7-repo: boolean (default=false)
2524
- enable-official-puppet8-repo: boolean (default=false)
2625
- skip-puppet-setup: boolean (default=false)
2726
-%>
@@ -72,7 +71,7 @@ runcmd:
7271
<% end -%>
7372
<% if puppet_enabled -%>
7473
- |
75-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
74+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') -%>
7675
<%= indent(2) { snippet 'puppetlabs_repo' } %>
7776
<% end -%>
7877
<%= 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') -%>
81+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-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') -%>
75+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') -%>
7676
<%= snippet 'puppetlabs_repo' %>
7777
<% end -%>
7878
<%= snippet 'puppet_setup' %>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description: |
99
-%>
1010
<%
1111
# safemode renderer does not support unary negation
12-
aio_enabled = host_param_true?('enable-puppetlabs-repo') || %w[official-puppet8 official-puppet7].any? { |repo| host_param_true?("enable-#{repo}-repo") }
12+
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo')
1313
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
1414
salt_enabled = host_param('salt_master') ? true : false
1515
os_major = @host.operatingsystem.major.to_i
@@ -288,9 +288,6 @@ rm /etc/resolv.conf
288288
if host_param_true?('enable-official-puppet8-repo')
289289
puppet_repo_url = "#{puppet_repo_url_base}/puppet8/sles/#{os_major}/#{@host.architecture}/"
290290
puppet_repo_alias = 'puppet8-release'
291-
elsif host_param_true?('enable-official-puppet7-repo')
292-
puppet_repo_url = "#{puppet_repo_url_base}/puppet7/sles/#{os_major}/#{@host.architecture}/"
293-
puppet_repo_alias = 'puppet7-release'
294291
else
295292
puppet_repo_url = "#{puppet_repo_url_base}/puppet/sles/#{os_major}/#{@host.architecture}/"
296293
puppet_repo_alias = 'puppet-release'

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

Lines changed: 3 additions & 8 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')
14+
aio_enabled = host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8')
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,14 +303,9 @@ 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') -%>
306+
<% if host_param_true?('enable-official-puppet8-repo') -%>
307307
<%
308-
puppet_repo_url_base = 'http://yum.puppet.com'
309-
if host_param_true?('enable-official-puppet8-repo')
310-
puppet_repo_url = "#{puppet_repo_url_base}/puppet7/sles/#{os_major}/#{@host.architecture}/"
311-
elsif host_param_true?('enable-official-puppet7-repo')
312-
puppet_repo_url = "#{puppet_repo_url_base}/puppet7/sles/#{os_major}/#{@host.architecture}/"
313-
end
308+
puppet_repo_url = "https://yum.puppet.com/puppet8/sles/#{os_major}/#{@host.architecture}/"
314309
%>
315310
<listentry>
316311
<media_url><![CDATA[<%= puppet_repo_url %>]]></media_url>

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-official-puppet7-repo: boolean (default=false)
3837
- enable-official-puppet8-repo: boolean (default=false)
3938
- skip-puppet-setup: boolean (default=false)
4039
- salt_master: string (default=undef)
@@ -303,7 +302,7 @@ chmod +x /root/remote_execution_pull_setup.sh
303302
<% end -%>
304303

305304
<% if puppet_enabled %>
306-
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
305+
<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') -%>
307306
<%= snippet 'puppetlabs_repo' %>
308307
<% end -%>
309308
<%= 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 7 and newer. Supports hostcert_renewal_interval for Puppet 8+.
9+
Puppet 8 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')
15+
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8')
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: 1 addition & 1 deletion
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')
20+
aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8')
2121
aio_openvox_enabled = host_param_true?('enable-openvox7') || host_param_true?('enable-openvox8')
2222

2323
if host_param('run-puppet-in-installer-tags')

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ if host_param_true?('enable-puppetlabs-repo')
4040
repo_name = 'puppet-release'
4141
elsif host_param_true?('enable-official-puppet8-repo')
4242
repo_name = 'puppet8-release'
43-
elsif host_param_true?('enable-official-puppet7-repo')
44-
repo_name = 'puppet7-release'
4543
end
4644
-%>
4745
<% if repo_name -%>

0 commit comments

Comments
 (0)