[Fedora-spins] [spin-kickstarts/f21] fixes from Ian McLeod to make composes work using new scheme.

[Matthew Miller]

commit ec10c9919bbdd35658d8d364ab10c0f74ae04091
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Tue Sep 9 14:09:55 2014 -0400

    fixes from Ian McLeod to make composes work using new scheme.
    
    NOTE: this WILL NOT WORK without other changes to coms and spin/install (but
    the current ones are broken anyway so I'm committing this).
    
    See https://lists.fedoraproject.org/pipermail/cloud/2014-September/004207.html
    for details

 fedora-cloud-base.ks         |   23 ++---------------------
 fedora-cloud-experimental.ks |   22 ++--------------------
 fedora-install-cloud.ks      |    6 +++---
 3 files changed, 7 insertions(+), 44 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index bb06c35..26431a5 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -34,7 +34,6 @@ part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
-
 reboot
 
 # Package list.
@@ -44,32 +43,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
+ at cloud-server
 
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index f6a3bee..e181d67 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -35,32 +35,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+ at cloud-server
 
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 31f386f..9e39758 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -1,4 +1,4 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
 # Maintained by the Fedora Release Engineering team:
 # https://fedoraproject.org/wiki/ReleaseEngineering
 # mailto:rel-eng at lists.fedoraproject.org
@@ -79,8 +79,8 @@ dracut-*
 # Things needed for installation
 @anaconda-tools
 
-# package cloud base image installs that probably should go in some comps group but what????
-heat-cfntools
+# Packages to enable server images to run in cloud environments
+ at cloud-server
 
 # Langpacks
 autocorr-*