templates - sync from community-templates

theforeman · Oct 27, 2014 · 9736dac · 9736dac
1 parent 6e916e5
commit 9736dac
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 39 deletions.
diff --git a/app/views/unattended/autoyast/provision_sles.erb b/app/views/unattended/autoyast/provision_sles.erb
@@ -164,6 +164,26 @@ rm /etc/resolv.conf
           </import_gpg_key>
         </signature-handling>
       </listentry>
+      <listentry>
+        <media_url><![CDATA[http://download.opensuse.org/repositories/devel:languages:ruby:backports/SLE_<%= @host.operatingsystem.major %>_SP<%= @host.operatingsystem.minor %>/]]></media_url>
+        <name>devel_languages_ruby_backports</name>
+        <product>devel_languages_ruby_backports</product>
+        <product_dir>/</product_dir>
+        <signature-handling>
+          <accept_non_trusted_gpg_key>
+            <all config:type="boolean">false</all>
+            <keys config:type="list">
+              <keyid>9AF0C9A20E9AF123</keyid>
+            </keys>
+          </accept_non_trusted_gpg_key>
+          <import_gpg_key>
+            <all config:type="boolean">false</all>
+            <keys config:type="list">
+              <keyid>9AF0C9A20E9AF123</keyid>
+            </keys>
+          </import_gpg_key>
+        </signature-handling>
+        </listentry>
 <% end -%>
 <% if salt_enabled %>
       <listentry>

diff --git a/app/views/unattended/kickstart/finish.erb b/app/views/unattended/kickstart/finish.erb
@@ -53,7 +53,13 @@ cat > /etc/puppet/puppet.conf << EOF
 EOF
 
 # Setup puppet to run on system reboot
+<% if @host.operatingsystem.name == 'Fedora' -%>
+puppet_unit=puppet
+/usr/bin/systemctl list-unit-files | grep -q puppetagent && puppet_unit=puppetagent
+/usr/bin/systemctl enable ${puppet_unit}
+<% else -%>
 /sbin/chkconfig --level 345 puppet on
+<% end -%>
 
 /usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag <%= @host.puppetmaster.blank? ? '' : "--server #{@host.puppetmaster}" %> --no-daemonize
 <% end -%>

diff --git a/app/views/unattended/preseed/PXELinux.erb b/app/views/unattended/preseed/PXELinux.erb
@@ -12,7 +12,7 @@ oses:
 <% if @host.operatingsystem.name == 'Debian' -%>
 <% keyboard_params = "auto=true console-keymaps-at/keymap=us keymap=us domain=#{@host.domain}" -%>
 <% else -%>
-<% keyboard_params = 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us' -%>
+<% keyboard_params = 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us localechooser/translation/warn-light=true localechooser/translation/warn-severe=true' -%>
 <% end -%>
 default linux
 label linux

diff --git a/app/views/unattended/preseed/disklayout_lvm.erb b/app/views/unattended/preseed/disklayout_lvm.erb
@@ -16,47 +16,47 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
-d-i partman-auto/init_automatically_partition \\
+d-i partman-auto/init_automatically_partition \
 	select Guided - use entire disk and set up LVM
 
 d-i partman-auto-lvm/guided_size string max
 d-i partman-auto-lvm/new_vg_name string vg00
 
-d-i partman-auto/expert_recipe string                         \\
-      boot-root ::                                            \\
-              64 128 128 ext3                                 \\
-                      $primary{ } $bootable{ }                \\
-                      method{ format } format{ }              \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ /boot }                     \\
-              .                                               \\
-              128 512 200% linux-swap                         \\
-                      method{ swap } format{ }                \\
-              .                                               \\
-              512 512 512 ext3                                \\
-                      method{ format } format{ } $lvmok{ }    \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ / }                         \\
-              .                                               \\
-              256 256 256 ext3                                \\
-                      method{ format } format{ } $lvmok{ }    \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ /home }                     \\
-              .                                               \\
-              256 512 512 ext3                                \\
-                      method{ format } format{ } $lvmok{ }    \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ /tmp }                      \\
-              .                                               \\
-              2048 4096 4096 ext3                             \\
-                      method{ format } format{ } $lvmok{ }    \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ /usr }                      \\
-              .                                               \\
-              2048 4096 -1 ext3                               \\
-                      method{ format } format{ } $lvmok{ }    \\
-                      use_filesystem{ } filesystem{ ext4 }    \\
-                      mountpoint{ /var }                      \\
+d-i partman-auto/expert_recipe string                         \
+      boot-root ::                                            \
+              64 128 128 ext3                                 \
+                      $primary{ } $bootable{ }                \
+                      method{ format } format{ }              \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /boot }                     \
+              .                                               \
+              128 512 200% linux-swap                         \
+                      method{ swap } format{ }                \
+              .                                               \
+              512 512 512 ext3                                \
+                      method{ format } format{ } $lvmok{ }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ / }                         \
+              .                                               \
+              256 256 256 ext3                                \
+                      method{ format } format{ } $lvmok{ }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /home }                     \
+              .                                               \
+              256 512 512 ext3                                \
+                      method{ format } format{ } $lvmok{ }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /tmp }                      \
+              .                                               \
+              2048 4096 4096 ext3                             \
+                      method{ format } format{ } $lvmok{ }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /usr }                      \
+              .                                               \
+              2048 4096 -1 ext3                               \
+                      method{ format } format{ } $lvmok{ }    \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /var }                      \
               .
 
 d-i partman/default_filesystem string ext4

diff --git a/app/views/unattended/preseed/provision.erb b/app/views/unattended/preseed/provision.erb
@@ -108,7 +108,7 @@ d-i apt-setup/local<%= repos %>/key string http://keyserver.ubuntu.com/pks/looku
 <% end -%>
 
 # Install minimal task set (see tasksel --task-packages minimal)
-tasksel tasksel/first multiselect minimal, ssh-server
+tasksel tasksel/first multiselect minimal, ssh-server, openssh-server
 
 <% if puppet_enabled %>
   <% if @host.operatingsystem.name == 'Ubuntu' and @host.operatingsystem.major.to_i == 10 -%>

diff --git a/app/views/unattended/pxe/PXELinux_default.erb b/app/views/unattended/pxe/PXELinux_default.erb
@@ -24,7 +24,7 @@ LABEL <%= "#{profile[:template]} - #{profile[:hostgroup]}" %>
 <% when 'kickstart' -%>
      append initrd=<%= profile[:hostgroup].operatingsystem.initrd(profile[:hostgroup].architecture) %> ks=<%= default_template_url(profile[:template], profile[:hostgroup]) %> ksdevice=bootif network kssendmac
 <% when 'preseed' -%>
-     append initrd=<%= profile[:hostgroup].operatingsystem.initrd(profile[:hostgroup].architecture) %> interface=auto url=<%= default_template_url(profile[:template], profile[:hostgroup]) %> ramdisk_size=10800 root=/dev/rd/0 rw auto hostname=unassigned-hostname locale=en_US console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA
+     append initrd=<%= profile[:hostgroup].operatingsystem.initrd(profile[:hostgroup].architecture) %> interface=auto url=<%= default_template_url(profile[:template], profile[:hostgroup]) %> ramdisk_size=10800 root=/dev/rd/0 rw auto hostname=unassigned-hostname locale=<%= profile[:hostgroup].params['lang'] || 'en_US' %> console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA
 <% end -%>
 
 <% end -%>
diff --git a/app/views/unattended/snippets/_epel.erb b/app/views/unattended/snippets/_epel.erb
@@ -13,6 +13,8 @@ name: epel
   epel_url.gsub!("$os",'5-4')
   when '6'
   epel_url.gsub!("$os",'6-8')
+  when '7'
+  epel_url = "http://dl.fedoraproject.org/pub/epel/7/$arch/e/epel-release-7-2.noarch.rpm"
   else
   ''
   end