templates - sync from community-templates

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

@@ -12,8 +12,8 @@ oses:
 This template accepts the following parameters:
 - force-puppet: boolean (default=false)
 - enable-puppetlabs-repo: boolean (default=false)
-- enable-puppetlabs-pc1-repo: boolean (default=false)
 - enable-puppetlabs-puppet5-repo: boolean (default=false)
+- enable-puppetlabs-puppet6-repo: boolean (default=false)
 -%>
 <%
   pm_set = @host.puppetmaster.empty? ? false : true
@@ -24,10 +24,12 @@ hostname: <%= @host.name %>
 fqdn: <%= @host %>
 manage_etc_hosts: true
 users: {}
-<% if puppet_enabled %>
 runcmd:
 - |
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<%= indent(2) { snippet 'redhat_register' } %>
+- |
+<% if puppet_enabled %>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= indent(2) { snippet('puppet_setup', :variables => { :full_puppet_run => true }) } %>

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

@@ -72,7 +72,7 @@ fi
 <% end -%>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

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

@@ -45,7 +45,7 @@ oses:
 <% end -%>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

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

@@ -11,7 +11,7 @@ oses:
   os_minor = @host.operatingsystem.minor.to_i
   # safemode renderer does not support unary negation
   pm_set = @host.puppetmaster.empty? ? false : true
-  aio_enabled = host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppet4') || host_param_true?('enable-puppet5')
+  aio_enabled = host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppet5')
   puppet_enabled = pm_set || host_param_true?('force-puppet')
   salt_enabled = host_param('salt_master') ? true : false
   sles_minor_string = (os_minor == 0) ? '' : "_SP#{os_minor}"
@@ -247,11 +247,11 @@ rm /etc/resolv.conf
       </listentry>
 <% end -%>
 <% if puppet_enabled -%>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') or host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%
-  puppet_repo_url_base = 'http://yum.puppetlabs.com'
-  if host_param_true?('enable-puppetlabs-pc1-repo')
-    puppet_repo_url = "#{puppet_repo_url_base}/sles/#{os_major}/PC1/#{@host.architecture}/"
+  puppet_repo_url_base = 'http://yum.puppet.com'
+  if host_param_true?('enable-puppetlabs-puppet6-repo')
+    puppet_repo_url = "#{puppet_repo_url_base}/puppet6/sles/#{os_major}/#{@host.architecture}/"
   elsif host_param_true?('enable-puppetlabs-puppet5-repo')
     puppet_repo_url = "#{puppet_repo_url_base}/puppet5/sles/#{os_major}/#{@host.architecture}/"
   end

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

@@ -18,8 +18,8 @@ This template accepts the following parameters:
 - force-puppet: boolean (default=false)
 - enable-epel: boolean (default=true)
 - enable-puppetlabs-repo: boolean (default=false)
-- enable-puppetlabs-pc1-repo: boolean (default=false)
 - enable-puppetlabs-puppet5-repo: boolean (default=false)
+- enable-puppetlabs-puppet6-repo: boolean (default=false)
 - salt_master: string (default=undef)
 - ntp-server: string (default="0.fedora.pool.ntp.org")
 - bootloader-append: string (default="nofb quiet splash=quiet")
@@ -235,7 +235,7 @@ fi
 <% end -%>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo')|| host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

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

@@ -8,7 +8,7 @@ snippet: true
   os_family = @host.operatingsystem.family
   os_name   = @host.operatingsystem.name
 
-  aio_enabled = host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppet4') || host_param_true?('enable-puppet5')
+  aio_enabled = host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6') || host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppet5')
   aio_available = os_family == 'Debian' || os_family == 'Redhat' || os_name == 'SLES'
 
   if aio_enabled && aio_available

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

@@ -10,10 +10,10 @@ os_family = @host.operatingsystem.family
 os_major  = @host.operatingsystem.major.to_i
 os_name   = @host.operatingsystem.name
 
-aio_enabled = host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppet4') || host_param_true?('enable-puppet5')
+aio_enabled = host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6') || host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppet5')
 
 if os_family == 'Freebsd'
-  freebsd_package = host_param_true?('enable-puppet5') ? 'puppet5' : 'puppet4'
+  freebsd_package = host_param_true?('enable-puppet6') ? 'puppet6' : 'puppet5'
   etc_path = '/usr/local/etc/puppet'
   bin_path = '/usr/local/bin'
 elsif os_family == 'Windows'
@@ -43,9 +43,9 @@ else
   yum -t -y install <%= linux_package %>
 fi
 <% elsif os_family == 'Suse' -%>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
-rpmkeys --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
-rpmkeys --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet
+<% if host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppetlabs
+rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppet
 <% end -%>
 <% if @host.provision_method == 'image' -%>
 /usr/bin/zypper -n install <%= linux_package %>

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

@@ -15,32 +15,33 @@ os_major  = @host.operatingsystem.major.to_i
 os_name   = @host.operatingsystem.name
 
 if os_family == 'Redhat'
-  repo_host = 'yum.puppetlabs.com'
+  repo_host = 'yum.puppet.com'
   if os_name == 'Fedora'
     repo_os = 'fedora'
   else
     repo_os = 'el'
   end
 elsif os_family == 'Suse'
-  repo_host = 'yum.puppetlabs.com'
+  repo_host = 'yum.puppet.com'
   repo_os = 'sles' # PuppetLabs repos only exist for SLES, not OpenSUSE
 elsif os_family == 'Debian'
-  repo_host = 'apt.puppetlabs.com'
+  repo_host = 'apt.puppet.com'
   repo_os = @host.operatingsystem.release_name
 elsif os_family == 'Windows'
-  repo_host = 'downloads.puppetlabs.com'
+  repo_host = 'downloads.puppet.com'
   repo_os = 'windows'
 end
 
 if host_param_true?('enable-puppetlabs-repo')
   repo_name = 'puppetlabs-release'
-elsif host_param_true?('enable-puppetlabs-pc1-repo')
-  repo_name = 'puppetlabs-release-pc1'
+  repo_subdir = ''
+elsif host_param_true?('enable-puppetlabs-puppet6-repo')
+  repo_name = 'puppetlabs-release-puppet6'
+  repo_subdir = 'puppet6/'
 elsif host_param_true?('enable-puppetlabs-puppet5-repo')
   repo_name = 'puppet5-release'
+  repo_subdir = 'puppet5/'
 end
-
-repo_subdir = host_param_true?('enable-puppetlabs-puppet5-repo') ? 'puppet5/' : ''
 -%>
 
 <% if repo_name -%>

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

@@ -27,7 +27,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e
 <%= snippet "blacklist_kernel_modules" %>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') -%>
+<% if host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

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

@@ -64,7 +64,7 @@ fi
 <% end -%>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

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

@@ -37,7 +37,7 @@ echo 'Acquire::http::Proxy "<%= proxy_uri %>";' >> /etc/apt/apt.conf
 <% end -%>
 
 <% if puppet_enabled %>
-<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
 <%= snippet 'puppetlabs_repo' %>
 <% end -%>
 <%= snippet 'puppet_setup' %>

test/unit/foreman/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit default.snap.txt

@@ -3,6 +3,17 @@ hostname: snapshothost
 fqdn: snapshothost
 manage_etc_hosts: true
 users: {}
+runcmd:
+- |
+  
+  
+  
+  
+  
+  
+  
+
+- |
 
 phone_home:
   url: http://foreman.some.host.fqdn/unattended/built