19 files changed, 164 insertions, 0 deletions

diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend
index 52eab54..52eab54 100644
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend
+++ b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend
diff --git a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend
new file mode 100644
index 0000000..52eab54
--- /dev/null
+++ b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend
@@ -0,0 +1,9 @@
+do_install_append() {
+    cd ${S}/contrib/wrt
+    oe_runmake
+
+    install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
+
+    # Remove /var/run as it is created on startup
+    rm -rf ${D}${localstatedir}/run
+}
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend
index 34ad5b8..34ad5b8 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend
index 34ad5b8..34ad5b8 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend
index 34ad5b8..34ad5b8 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend
index 34ad5b8..34ad5b8 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend
index 7b4d5df..7b4d5df 100644
--- a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend
+++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend
index 7b4d5df..7b4d5df 100644
--- a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend
+++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend
index 3a6634e..3a6634e 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend
+++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend
index 3a6634e..3a6634e 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend
+++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend
index eb7a921..eb7a921 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend
+++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend
diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql
new file mode 100644
index 0000000..5a34ec0
--- /dev/null
+++ b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:     postgresql
+# Required-Start:   $local_fs $remote_fs $network $time
+# Required-Stop:    $local_fs $remote_fs $network $time
+# Should-Start:     $syslog
+# Should-Stop:      $syslog
+# Default-Start:    2 3 4 5
+# Default-Stop:     0 1 6
+# Short-Description:    PostgreSQL RDBMS server
+### END INIT INFO
+
+DAEMON=/usr/bin/postmaster
+DESC="PostgreSQL RDBMS server"
+
+datadir=`grep ^data_directory /etc/postgresql/postgresql.conf |sed -e "s#^.*= '##; s#'.*##"`
+if [ "$datadir" = "" ] ; then
+    datadir=/etc/postgresql
+else
+    if [ ! -e $datadir/postgresql.conf ] ; then
+        if [ -e /etc/postgresql/postgresql.conf -a -e $datadir ] ; then
+            ln -s /etc/postgresql/*.conf $datadir/
+        fi
+    fi
+fi
+
+cd /
+
+start ()
+{
+    echo -n "Starting postgres server..."
+    if pidof ${DAEMON} > /dev/null; then
+        echo "already running."
+        exit 0
+    fi
+    touch /var/log/postgresql.log
+    chown postgres /var/log/postgresql.log
+    sudo -u postgres /usr/bin/pg_ctl start -w -D $datadir -s -l /var/log/postgresql.log
+    if [ $? -eq 0 ]; then
+        echo "done."
+    else
+        echo "failed."
+    fi
+}
+
+stop ()
+{
+    echo -n "Stopping postgres server..."
+    if ! pidof ${DAEMON} >/dev/null; then
+        echo "not running."
+        exit 0
+    fi
+    sudo -u postgres /usr/bin/pg_ctl stop -w -D $datadir -m fast -s
+    if [ $? -eq 0 ]; then
+        echo "done."
+    else
+        if [ -f /etc/postgresql/postmaster.pid -a "$datadir" != "/etc/postgresql" ] ; then
+            # Special case for transition 
+            sudo -u postgres /usr/bin/pg_ctl stop -w -D /etc/postgresql -m fast -s
+        fi
+        if ! pidof ${DAEMON} > /dev/null; then
+            echo "done."
+        else
+            echo "failed."
+            exit 1
+        fi
+    fi
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    force-reload)
+        stop
+        start
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|force-reload|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init
new file mode 100644
index 0000000..c9c3807
--- /dev/null
+++ b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init
@@ -0,0 +1,43 @@
+#!/bin/sh
+# set -x
+
+PN=postgresql
+CONTROLLER_IP=%CONTROLLER_IP%
+COMPUTE_IP=%COMPUTE_IP%
+DB_USER=%DB_USER%
+DB_PASSWORD=%DB_PASSWORD%
+
+if [ -e /etc/${PN}/PG_VERSION ]; then
+    # the database has already been initialized, return
+    exit 0
+fi
+
+sudo -u postgres initdb -D /etc/${PN}/
+echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf
+echo "host   all   all   ${CONTROLLER_IP}/32   trust" >> /etc/${PN}/pg_hba.conf
+echo "host   all   all   ${COMPUTE_IP}/32   trust" >> /etc/${PN}/pg_hba.conf
+/etc/init.d/postgresql start
+
+count=0
+done=0
+while [ $count -le 10 ] && [ $done -eq 0 ]; do
+    sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" 2> /dev/null
+    if [ $? -ne 0 ]; then
+        echo "[INFO] postgres: failed to create account for ${DB_USER}, trying again"
+        /etc/init.d/postgresql stop
+        sleep 3
+        /etc/init.d/postgresql start
+        sleep 3
+    else
+        echo "[INFO] postgres: created account for ${DB_USER}, continuing .. "
+        done=1
+    fi
+    count=`expr $count + 1`
+done
+    
+if [ $done -eq 0 ]; then
+    echo "[ERROR] postgres: unable to create admin account"
+    exit 1
+fi
+
+ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone || true
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend
index 98e7207..98e7207 100644
--- a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend
+++ b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend
index 3c691d3..3c691d3 100644
--- a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend
+++ b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend
index 3c691d3..3c691d3 100644
--- a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend
+++ b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend
new file mode 100644
index 0000000..7b4d5df
--- /dev/null
+++ b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend
@@ -0,0 +1,5 @@
+INC := "${@int(PRINC) + 1}"
+
+RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \
+                      kernel-module-xt-redirect \
+                      "
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend
new file mode 100644
index 0000000..eb7a921
--- /dev/null
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend
@@ -0,0 +1,13 @@
+PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
+                 python numactl sanlock ebtables \
+                 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+                "
+
+inherit useradd
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system libvirt"
+
+do_install_append() {
+        sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf
+        sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf
+}
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
new file mode 100644
index 0000000..34ad5b8
--- /dev/null
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN} += "kernel-module-veth \
+        "