Commit 9de387a2 authored by Tomer Brisker's avatar Tomer Brisker Committed by Tomer Brisker
Browse files

templates - sync from community-templates

parent 11ba481f
Showing with 43 additions and 29 deletions
+43 -29
...@@ -12,8 +12,8 @@ oses: ...@@ -12,8 +12,8 @@ oses:
This template accepts the following parameters: This template accepts the following parameters:
- force-puppet: boolean (default=false) - force-puppet: boolean (default=false)
- enable-puppetlabs-repo: 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-puppet5-repo: boolean (default=false)
- enable-puppetlabs-puppet6-repo: boolean (default=false)
-%> -%>
<% <%
pm_set = @host.puppetmaster.empty? ? false : true pm_set = @host.puppetmaster.empty? ? false : true
...@@ -24,10 +24,12 @@ hostname: <%= @host.name %> ...@@ -24,10 +24,12 @@ hostname: <%= @host.name %>
fqdn: <%= @host %> fqdn: <%= @host %>
manage_etc_hosts: true manage_etc_hosts: true
users: {} users: {}
<% if puppet_enabled %>
runcmd: 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= indent(2) { snippet('puppet_setup', :variables => { :full_puppet_run => true }) } %> <%= indent(2) { snippet('puppet_setup', :variables => { :full_puppet_run => true }) } %>
......
...@@ -72,7 +72,7 @@ fi ...@@ -72,7 +72,7 @@ fi
<% end -%> <% end -%>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -45,7 +45,7 @@ oses: ...@@ -45,7 +45,7 @@ oses:
<% end -%> <% end -%>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -11,7 +11,7 @@ oses: ...@@ -11,7 +11,7 @@ oses:
os_minor = @host.operatingsystem.minor.to_i os_minor = @host.operatingsystem.minor.to_i
# safemode renderer does not support unary negation # safemode renderer does not support unary negation
pm_set = @host.puppetmaster.empty? ? false : true 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') puppet_enabled = pm_set || host_param_true?('force-puppet')
salt_enabled = host_param('salt_master') ? true : false salt_enabled = host_param('salt_master') ? true : false
sles_minor_string = (os_minor == 0) ? '' : "_SP#{os_minor}" sles_minor_string = (os_minor == 0) ? '' : "_SP#{os_minor}"
...@@ -247,11 +247,11 @@ rm /etc/resolv.conf ...@@ -247,11 +247,11 @@ rm /etc/resolv.conf
</listentry> </listentry>
<% end -%> <% end -%>
<% if puppet_enabled -%> <% 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' puppet_repo_url_base = 'http://yum.puppet.com'
if host_param_true?('enable-puppetlabs-pc1-repo') if host_param_true?('enable-puppetlabs-puppet6-repo')
puppet_repo_url = "#{puppet_repo_url_base}/sles/#{os_major}/PC1/#{@host.architecture}/" puppet_repo_url = "#{puppet_repo_url_base}/puppet6/sles/#{os_major}/#{@host.architecture}/"
elsif host_param_true?('enable-puppetlabs-puppet5-repo') elsif host_param_true?('enable-puppetlabs-puppet5-repo')
puppet_repo_url = "#{puppet_repo_url_base}/puppet5/sles/#{os_major}/#{@host.architecture}/" puppet_repo_url = "#{puppet_repo_url_base}/puppet5/sles/#{os_major}/#{@host.architecture}/"
end end
......
...@@ -18,8 +18,8 @@ This template accepts the following parameters: ...@@ -18,8 +18,8 @@ This template accepts the following parameters:
- force-puppet: boolean (default=false) - force-puppet: boolean (default=false)
- enable-epel: boolean (default=true) - enable-epel: boolean (default=true)
- enable-puppetlabs-repo: 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-puppet5-repo: boolean (default=false)
- enable-puppetlabs-puppet6-repo: boolean (default=false)
- salt_master: string (default=undef) - salt_master: string (default=undef)
- ntp-server: string (default="0.fedora.pool.ntp.org") - ntp-server: string (default="0.fedora.pool.ntp.org")
- bootloader-append: string (default="nofb quiet splash=quiet") - bootloader-append: string (default="nofb quiet splash=quiet")
...@@ -235,7 +235,7 @@ fi ...@@ -235,7 +235,7 @@ fi
<% end -%> <% end -%>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -8,7 +8,7 @@ snippet: true ...@@ -8,7 +8,7 @@ snippet: true
os_family = @host.operatingsystem.family os_family = @host.operatingsystem.family
os_name = @host.operatingsystem.name 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' aio_available = os_family == 'Debian' || os_family == 'Redhat' || os_name == 'SLES'
if aio_enabled && aio_available if aio_enabled && aio_available
......
...@@ -10,10 +10,10 @@ os_family = @host.operatingsystem.family ...@@ -10,10 +10,10 @@ os_family = @host.operatingsystem.family
os_major = @host.operatingsystem.major.to_i os_major = @host.operatingsystem.major.to_i
os_name = @host.operatingsystem.name 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' 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' etc_path = '/usr/local/etc/puppet'
bin_path = '/usr/local/bin' bin_path = '/usr/local/bin'
elsif os_family == 'Windows' elsif os_family == 'Windows'
...@@ -43,9 +43,9 @@ else ...@@ -43,9 +43,9 @@ else
yum -t -y install <%= linux_package %> yum -t -y install <%= linux_package %>
fi fi
<% elsif os_family == 'Suse' -%> <% elsif os_family == 'Suse' -%>
<% if host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%> <% if host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
rpmkeys --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppetlabs
rpmkeys --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppet
<% end -%> <% end -%>
<% if @host.provision_method == 'image' -%> <% if @host.provision_method == 'image' -%>
/usr/bin/zypper -n install <%= linux_package %> /usr/bin/zypper -n install <%= linux_package %>
......
...@@ -15,32 +15,33 @@ os_major = @host.operatingsystem.major.to_i ...@@ -15,32 +15,33 @@ os_major = @host.operatingsystem.major.to_i
os_name = @host.operatingsystem.name os_name = @host.operatingsystem.name
if os_family == 'Redhat' if os_family == 'Redhat'
repo_host = 'yum.puppetlabs.com' repo_host = 'yum.puppet.com'
if os_name == 'Fedora' if os_name == 'Fedora'
repo_os = 'fedora' repo_os = 'fedora'
else else
repo_os = 'el' repo_os = 'el'
end end
elsif os_family == 'Suse' 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 repo_os = 'sles' # PuppetLabs repos only exist for SLES, not OpenSUSE
elsif os_family == 'Debian' elsif os_family == 'Debian'
repo_host = 'apt.puppetlabs.com' repo_host = 'apt.puppet.com'
repo_os = @host.operatingsystem.release_name repo_os = @host.operatingsystem.release_name
elsif os_family == 'Windows' elsif os_family == 'Windows'
repo_host = 'downloads.puppetlabs.com' repo_host = 'downloads.puppet.com'
repo_os = 'windows' repo_os = 'windows'
end end
if host_param_true?('enable-puppetlabs-repo') if host_param_true?('enable-puppetlabs-repo')
repo_name = 'puppetlabs-release' repo_name = 'puppetlabs-release'
elsif host_param_true?('enable-puppetlabs-pc1-repo') repo_subdir = ''
repo_name = 'puppetlabs-release-pc1' elsif host_param_true?('enable-puppetlabs-puppet6-repo')
repo_name = 'puppetlabs-release-puppet6'
repo_subdir = 'puppet6/'
elsif host_param_true?('enable-puppetlabs-puppet5-repo') elsif host_param_true?('enable-puppetlabs-puppet5-repo')
repo_name = 'puppet5-release' repo_name = 'puppet5-release'
repo_subdir = 'puppet5/'
end end
repo_subdir = host_param_true?('enable-puppetlabs-puppet5-repo') ? 'puppet5/' : ''
-%> -%>
<% if repo_name -%> <% if repo_name -%>
......
...@@ -27,7 +27,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e ...@@ -27,7 +27,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e
<%= snippet "blacklist_kernel_modules" %> <%= snippet "blacklist_kernel_modules" %>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -64,7 +64,7 @@ fi ...@@ -64,7 +64,7 @@ fi
<% end -%> <% end -%>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -37,7 +37,7 @@ echo 'Acquire::http::Proxy "<%= proxy_uri %>";' >> /etc/apt/apt.conf ...@@ -37,7 +37,7 @@ echo 'Acquire::http::Proxy "<%= proxy_uri %>";' >> /etc/apt/apt.conf
<% end -%> <% end -%>
<% if puppet_enabled %> <% 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' %> <%= snippet 'puppetlabs_repo' %>
<% end -%> <% end -%>
<%= snippet 'puppet_setup' %> <%= snippet 'puppet_setup' %>
......
...@@ -3,6 +3,17 @@ hostname: snapshothost ...@@ -3,6 +3,17 @@ hostname: snapshothost
fqdn: snapshothost fqdn: snapshothost
manage_etc_hosts: true manage_etc_hosts: true
users: {} users: {}
runcmd:
- |
- |
phone_home: phone_home:
url: http://foreman.some.host.fqdn/unattended/built url: http://foreman.some.host.fqdn/unattended/built
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment