Skip to content

Fixes #39653 - Remove Puppet 6 references #11180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakduch wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes #39653 - Remove Puppet 6 references #11180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/cloud_init/cloud_init_default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ description: |
This template accepts the following parameters:
- force-puppet: boolean (default=false)
- enable-puppetlabs-repo: boolean (default=false)
- enable-puppetlabs-puppet6-repo: boolean (default=false)
- enable-official-puppet7-repo: boolean (default=false)
- enable-official-puppet8-repo: boolean (default=false)
- skip-puppet-setup: boolean (default=false)
Expand All @@ -42,7 +41,7 @@ description: |
rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
-%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/finish/agama_default_finish.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ oses:
<%
pm_set = @host.puppet_server.present?
puppet_enabled = pm_set || host_param_true?('force-puppet')
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
-%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/finish/kickstart_default_finish.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ description: |
rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
os_major = @host.operatingsystem.major.to_i
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/finish/preseed_default_finish.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ description: |

This template accepts the following parameters:
- enable-puppetlabs-repo: boolean (default=undef)
- enable-puppetlabs-puppet6-repo: boolean (default=undef)
- enable-official-puppet7-repo: boolean (default=undef)
- enable-official-puppet8-repo: boolean (default=undef)
- enable-openvox8: boolean (default=undef)
Expand All @@ -31,7 +30,7 @@ description: |
<%
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/host_init_config/host_init_config_default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ description: |

This template accepts the following parameters:
- enable-puppetlabs-repo: boolean (default=undef)
- enable-puppetlabs-puppet6-repo: boolean (default=undef)
- enable-official-puppet7-repo: boolean (default=undef)
- enable-official-puppet8-repo: boolean (default=undef)
- enable-openvox8: boolean (default=undef)
Expand All @@ -40,7 +39,7 @@ description: |
<%
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
-%>
#!/bin/bash
Expand Down
6 changes: 2 additions & 4 deletions app/views/unattended/provisioning_templates/provision/autoyast_sles_default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: |
os_major = @host.operatingsystem.major.to_i
os_minor = @host.operatingsystem.minor.to_i
# safemode renderer does not support unary negation
puppetlabs_repo_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')
puppetlabs_repo_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')
voxpupuli_repo_enabled = [9, 8].any? { |version| host_param_true?("enable-openvox#{version}-repo") }
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
salt_enabled = host_param('salt_master') ? true : false
Expand Down Expand Up @@ -310,15 +310,13 @@ rm /etc/resolv.conf
<% end -%>
<% end -%>
<% if puppet_enabled && puppetlabs_repo_enabled -%>
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') -%>
<% if host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo') -%>
<%
puppet_repo_url_base = 'http://yum.puppet.com'
if host_param_true?('enable-official-puppet8-repo')
puppet_repo_url = "#{puppet_repo_url_base}/puppet8/sles/#{os_major}/#{@host.architecture}/"
elsif host_param_true?('enable-official-puppet7-repo')
puppet_repo_url = "#{puppet_repo_url_base}/puppet7/sles/#{os_major}/#{@host.architecture}/"
elsif host_param_true?('enable-puppetlabs-puppet6-repo')
puppet_repo_url = "#{puppet_repo_url_base}/puppet6/sles/#{os_major}/#{@host.architecture}/"
end
%>
<listentry>
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/provision/kickstart_default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ description: |
- force-puppet: boolean (default=false)
- enable-epel: boolean (default=false)
- enable-puppetlabs-repo: boolean (default=false)
- enable-puppetlabs-puppet6-repo: boolean (default=false)
- enable-official-puppet7-repo: boolean (default=false)
- enable-official-puppet8-repo: boolean (default=false)
- enable-openvox8: boolean (default=undef)
Expand Down Expand Up @@ -79,7 +78,7 @@ description: |
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
proxy_string = proxy_uri ? " --proxy=#{proxy_uri}" : ''
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
4 changes: 2 additions & 2 deletions app/views/unattended/provisioning_templates/snippet/puppet.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ snippet: true
description: |
Generates a puppet.conf file which is required for the puppet agent bootstraping.
The puppet server and CA is configured based on the host configuration. It supports
Puppet 6 and newer. Supports hostcert_renewal_interval for Puppet 8+.
Puppet 7 and newer. Supports hostcert_renewal_interval for Puppet 8+.
-%>
<%
os_family = @host.operatingsystem.family
os_name = @host.operatingsystem.name

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')
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')
aio_available = os_family == 'Debian' || os_family == 'Redhat' || os_family == 'Suse'

if os_family == 'Windows'
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/snippet/puppet_setup.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ os_family = @host.operatingsystem.family
os_major = @host.operatingsystem.major.to_i
os_name = @host.operatingsystem.name

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')
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')
aio_openvox_enabled = %w(enable-openvox9 enable-openvox9-repo enable-openvox8 enable-openvox8-repo).any? { |param| host_param_true?(param) }

if aio_enabled && aio_openvox_enabled
Expand Down
4 changes: 1 addition & 3 deletions app/views/unattended/provisioning_templates/snippet/puppetlabs_repo.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ os_family = @host.operatingsystem.family
os_major = @host.operatingsystem.major.to_i
os_name = @host.operatingsystem.name

puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')

if puppetlabs_repo_enabled && voxpupuli_repo_enabled
Expand Down Expand Up @@ -56,8 +56,6 @@ elsif host_param_true?('enable-official-puppet8-repo')
repo_name = 'puppet8-release'
elsif host_param_true?('enable-official-puppet7-repo')
repo_name = 'puppet7-release'
elsif host_param_true?('enable-puppetlabs-puppet6-repo')
repo_name = 'puppet6-release'
end
-%>
<% if repo_name -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/snippet/voxpupuli_repo.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{
proxy_string = proxy_uri ? " -e https_proxy=#{proxy_uri}/" : ''
proxy_string_bits = proxy_uri ? " -ProxyUsage Override -ProxyList #{proxy_uri}" : ''

puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')

if puppetlabs_repo_enabled && voxpupuli_repo_enabled
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/user_data/agama_default_user_data.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description: |
<%
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
-%>
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/user_data/autoyast_default_user_data.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ description: |

This template accepts the following parameters:
- enable-puppetlabs-repo: boolean (default=undef)
- enable-puppetlabs-puppet6-repo: boolean (default=undef)
- enable-official-puppet7-repo: boolean (default=undef)
- enable-official-puppet8-repo: boolean (default=undef)
- enable-openvox8: boolean (default=undef)
Expand All @@ -30,7 +29,7 @@ description: |
<%
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
-%>
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/user_data/kickstart_default_user_data.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ description: |
- enable-official-puppet8-repo: boolean (default=false)
- enable-openvox8: boolean (default=false)
- enable-openvox9: boolean (default=false)
- enable-puppetlabs-puppet6-repo: boolean (default=false)
- enable-puppetlabs-repo: boolean (default=false)
- force-puppet: boolean (default=false)
- package_upgrade: boolean (default=true)
Expand All @@ -39,7 +38,7 @@ description: |
rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/user_data/preseed_default_user_data.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ description: |

This template accepts the following parameters:
- enable-puppetlabs-repo: boolean (default=undef)
- enable-puppetlabs-puppet6-repo: boolean (default=undef)
- enable-official-puppet7-repo: boolean (default=undef)
- enable-official-puppet8-repo: boolean (default=undef)
- enable-openvox8: boolean (default=undef)
Expand All @@ -39,7 +38,7 @@ description: |
# safemode renderer does not support unary negation
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
3 changes: 1 addition & 2 deletions app/views/unattended/provisioning_templates/user_data/userdata_default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ description: |
- package_upgrade: boolean (default=false)
- reboot: boolean (default=false)
- enable-puppetlabs-repo: boolean (default=undef)
- enable-puppetlabs-puppet6-repo: boolean (default=undef)
- enable-official-puppet7-repo: boolean (default=undef)
- enable-official-puppet8-repo: boolean (default=undef)
- enable-openvox8: boolean (default=undef)
Expand All @@ -42,7 +41,7 @@ description: |
rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
# safemode renderer does not support unary negation
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
puppetlabs_repo_enabled = 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')
puppetlabs_repo_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-official-puppet7-repo')
voxpupuli_repo_enabled = host_param_true?('enable-openvox9-repo') || host_param_true?('enable-openvox8-repo')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
Expand Down
Loading