From 608fa75973c111c61cf55e99cf3172ff3f3f00b1 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 4 Oct 2013 00:27:53 -0400
Subject: postgresql: unify startup and initialization

Since we can't count on package postinst order, many components check for
a configured postgresql daemon, and if not found, initialize it.

Rather than sprinkling the knowledge of how to initialize the database
through all these packages, we create a more robust, central postgresql-init
script, and call it when any component needs the database configured.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-nova-compute_2013.1.3.bbappend              | 11 -----------
 .../python/python-nova-controller_2013.1.3.bbappend           | 11 -----------
 .../recipes-devtools/python/python-nova_2013.1.3.bbappend     | 11 +++++++++++
 3 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 meta-openstack-qemu/recipes-devtools/python/python-nova-compute_2013.1.3.bbappend
 delete mode 100644 meta-openstack-qemu/recipes-devtools/python/python-nova-controller_2013.1.3.bbappend
 create mode 100644 meta-openstack-qemu/recipes-devtools/python/python-nova_2013.1.3.bbappend

(limited to 'meta-openstack-qemu')

diff --git a/meta-openstack-qemu/recipes-devtools/python/python-nova-compute_2013.1.3.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-nova-compute_2013.1.3.bbappend
deleted file mode 100644
index 45f4307..0000000
--- a/meta-openstack-qemu/recipes-devtools/python/python-nova-compute_2013.1.3.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-do_install_append() {
-    if [ ! -f "${WORKDIR}/nova.conf" ]; then
-        return
-    fi
-
-    TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
-    NOVA_CONF_DIR=${D}/${sysconfdir}/nova
-
-    sed -e "s:^libvirt_type.*=.*$:libvirt_type = qemu:" \
-        -i ${NOVA_CONF_DIR}/nova.conf
-}
diff --git a/meta-openstack-qemu/recipes-devtools/python/python-nova-controller_2013.1.3.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-nova-controller_2013.1.3.bbappend
deleted file mode 100644
index f45a02b..0000000
--- a/meta-openstack-qemu/recipes-devtools/python/python-nova-controller_2013.1.3.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-do_install_append() {
-    if [ ! -f "${WORKDIR}/nova.conf" ]; then
-        return
-    fi
-
-    TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
-    NOVA_CONF_DIR=${D}/${sysconfdir}/nova
-
-    sed -e "s:^libvirt_type.*=.*$:libvirt_type = qemu:" \
-        -i ${NOVA_CONF_DIR}/nova.conf
-}
\ No newline at end of file
diff --git a/meta-openstack-qemu/recipes-devtools/python/python-nova_2013.1.3.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-nova_2013.1.3.bbappend
new file mode 100644
index 0000000..45f4307
--- /dev/null
+++ b/meta-openstack-qemu/recipes-devtools/python/python-nova_2013.1.3.bbappend
@@ -0,0 +1,11 @@
+do_install_append() {
+    if [ ! -f "${WORKDIR}/nova.conf" ]; then
+        return
+    fi
+
+    TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
+    NOVA_CONF_DIR=${D}/${sysconfdir}/nova
+
+    sed -e "s:^libvirt_type.*=.*$:libvirt_type = qemu:" \
+        -i ${NOVA_CONF_DIR}/nova.conf
+}
-- 
cgit v1.2.3-54-g00ecf