Update test snapshots with template changes

theforeman · Nov 28, 2023 · 19aa152 · 19aa152
1 parent 4fd97e3
commit 19aa152
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/app/views/unattended/provisioning_templates/provision/autoyast_default.erb b/app/views/unattended/provisioning_templates/provision/autoyast_default.erb
@@ -252,13 +252,13 @@ rm /etc/resolv.conf
         <source><![CDATA[
 <%
   puppet_repo_url_base = 'http://yum.puppet.com'
-  
+
   %w[puppet puppetlabs puppet-20250406].each { |key|
 -%>
 rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-<%= key %>
 <% } -%>
 ]]>
-        </source> 
+        </source>
       </script>
     </pre-scripts>
 <% end -%>

diff --git a/...man/renderer/snapshots/ProvisioningTemplate/iPXE/AutoYaST_default_iPXE.host4dhcp.snap.txt b/...man/renderer/snapshots/ProvisioningTemplate/iPXE/AutoYaST_default_iPXE.host4dhcp.snap.txt
@@ -5,6 +5,6 @@ echo Trying to ping DNS: ${netX/dns}
 ping --count 1 ${netX/dns} || echo Ping to DNS failed or ping command not available.
 
 
-kernel http://mirror.centos.org/centos/7/os/x86_64/images/pxeboot/vmlinuz initrd=initrd.img splash=silent install=http://mirror.centos.org/centos/7/os/x86_64 autoyast=http://foreman.example.com/unattended/provision text-mode=1 useDHCP=1 
-initrd http://mirror.centos.org/centos/7/os/x86_64/images/pxeboot/initrd.img
+kernel http://mirror.centos.org/centos/7/os/x86_64/images/pxeboot/vmlinuz initrd=initrd.img splash=silent install=http://mirror.centos.org/centos/7/os/x86_64 autoyast=http://foreman.example.com/unattended/provision text-mode=1 useDHCP=1 BOOTIF=01-${netX/mac:hexhyp}
+initrd --name initrd.img http://mirror.centos.org/centos/7/os/x86_64/images/pxeboot/initrd.img
 boot
diff --git a/...man/renderer/snapshots/ProvisioningTemplate/provision/AutoYaST_default.host4dhcp.snap.txt b/...man/renderer/snapshots/ProvisioningTemplate/provision/AutoYaST_default.host4dhcp.snap.txt
@@ -18,7 +18,7 @@
     <interfaces config:type="list">
     </interfaces>
   </networking>
-      <ntp-client>
+  <ntp-client>
     <configure_dhcp config:type="boolean">false</configure_dhcp>
     <peers config:type="list">
       <peer>
@@ -146,6 +146,19 @@ rm /etc/resolv.conf
         </source>
       </script>
     </chroot-scripts>
+    <pre-scripts config:type=\"list\">
+      <script>
+        <filename>puppet-keys.sh</filename>
+        <interpreter>shell</interpreter>
+        <notification>Retrieving Puppet repository keys ...</notification>
+        <source><![CDATA[
+rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppet
+rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppetlabs
+rpmkeys --import http://yum.puppet.com/RPM-GPG-KEY-puppet-20250406
+]]>
+        </source>
+      </script>
+    </pre-scripts>
   </scripts>
   <keyboard>
     <keymap>english-us</keymap>
@@ -154,4 +167,8 @@ rm /etc/resolv.conf
     <hwclock>UTC</hwclock>
     <timezone>Etc/UTC</timezone>
   </timezone>
+  <add-on>
+    <add_on_products config:type=\"list\">
+    </add_on_products>
+  </add-on>
 </profile>