generic/fedora-20-cloud.ks | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
New commits:
commit aa36ef18be3681e55d1ef265e9f481ed81f62808
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sat Oct 5 14:26:16 2013 -0400
add heat-cfntools for openstack (it's small, and makes our official images
useful as _their_ official images.
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index a93fdfa..62582a8 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -50,6 +50,9 @@ kernel
# 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
commit c3df27a4f11705831502415a5e03b0fe3a19383d
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Fri Oct 4 15:48:05 2013 -0400
anaconda no longer requires firewalld
https://bugzilla.redhat.com/show_bug.cgi?id=1004976
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index af52ee6..a93fdfa 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -19,9 +19,8 @@ auth --useshadow --enablemd5
selinux --enforcing
rootpw --lock --iscrypted locked
-# this is actually not used, but a static firewall
-# matching these rules is generated below.
-firewall --service=ssh
+# a static firewall allowing ssh is configured below
+firewall --disabled
bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
@@ -63,11 +62,10 @@ dracut-config-generic
# by anaconda, but appliance-creator needs the hint
syslinux-extlinux
-# Needed initially, but removed below.
-firewalld
# Basic firewall. If you're going to rely on your cloud service's
-# security groups you can remove this.
+# security groups you can remove iptables-services.
+-firewalld
iptables-services
# cherry-pick a few things from @standard
@@ -133,11 +131,6 @@ echo .
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
-echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
# Non-firewalld-firewall
echo -n "Writing static firewall"
cat <<EOF > /etc/sysconfig/iptables
commit 89bd5b5954282a04e3423e56d45bb76c6378e35f
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Fri Oct 4 15:26:25 2013 -0400
too-aggressive yum cleaning causing tracebacks
diff --git a/generic/fedora-20-cloud.ks b/generic/fedora-20-cloud.ks
index c085058..af52ee6 100644
--- a/generic/fedora-20-cloud.ks
+++ b/generic/fedora-20-cloud.ks
@@ -235,8 +235,6 @@ echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/random-seed
echo "Cleaning old yum repodata."
-rm -rf /var/lib/yum/yumdb/*
-rm -rf /var/lib/yum/history/*
yum history new
yum clean all
truncate -c -s 0 /var/log/yum.log
_______________________________________________
cloud mailing list
cloud@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/cloud
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
