Make the lorax-composer ks templates more generic

Some platforms do not have grub2, and some require other partitions.

Anaconda will add platform specific partitions if the 'reqpart' command
is included, and it will add bootloader specific packages to the list if
they are needed.

(cherry picked from commit d27b4fcbd4)

share/composer/ami.ks

@@ -23,6 +23,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0"
+# Add platform specific partitions
+reqpart
 
 # Basic services
 services --enabled=sshd,chronyd,cloud-init
@@ -43,7 +45,6 @@ sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 chrony
 

share/composer/openstack.ks

@@ -20,6 +20,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0"
+# Add platform specific partitions
+reqpart
 
 # Start sshd and cloud-init at boot time
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -37,7 +39,6 @@ touch /etc/machine-id
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 # Make sure virt guest agents are installed
 qemu-guest-agent

share/composer/partitioned-disk.ks

@@ -20,6 +20,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr
+# Add platform specific partitions
+reqpart
 
 %post
 # Remove random-seed
@@ -34,6 +36,5 @@ touch /etc/machine-id
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 # NOTE lorax-composer will add the blueprint packages below here, including the final %end

share/composer/qcow2.ks

@@ -20,6 +20,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr
+# Add platform specific partitions
+reqpart
 
 %post
 # Remove random-seed
@@ -34,7 +36,6 @@ touch /etc/machine-id
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 # Make sure virt guest agents are installed
 qemu-guest-agent

share/composer/vhd.ks

@@ -23,6 +23,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 net.ifnames=0"
+# Add platform specific partitions
+reqpart
 
 # Basic services
 services --enabled=sshd,chronyd,waagent
@@ -62,7 +64,6 @@ dracut -f -v --persistent-policy by-uuid
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 chrony
 

share/composer/vmdk.ks

@@ -20,6 +20,8 @@ shutdown
 timezone  US/Eastern
 # System bootloader configuration
 bootloader --location=mbr
+# Add platform specific partitions
+reqpart
 
 # Basic services
 services --enabled=sshd,chronyd,vmtoolsd
@@ -37,7 +39,6 @@ touch /etc/machine-id
 kernel
 -dracut-config-rescue
 selinux-policy-targeted
-grub2
 
 chrony
 open-vm-tools