python-glance: Create log directory in initscript

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>

2 files changed, 12 insertions, 1 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance.init b/meta-openstack/recipes-devtools/python/python-glance/glance.init
index 7a269d6..c61abaa 100644
--- a/meta-openstack/recipes-devtools/python/python-glance/glance.init
+++ b/meta-openstack/recipes-devtools/python/python-glance/glance.init
@@ -28,6 +28,10 @@ start()
         fi
     fi
 
+    if [ ! -d /var/log/glance ]; then
+        mkdir /var/log/glance
+    fi
+
     echo -n "Starting $DESC..."
 
     start-stop-daemon --start --quiet --background \
diff --git a/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb b/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb
index 99d1577..a64ac9e 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb
@@ -58,7 +58,14 @@ pkg_postinst_${SRCNAME} () {
         exit 1
     fi
     
-    mkdir /var/log/glance
+    # This is to make sure postgres is configured and running
+    if ! pidof postmaster > /dev/null; then
+       sudo -u postgres initdb -D /etc/postgresql/
+       /etc/init.d/postgresql start
+       sleep 0.5
+       sudo -u postgres psql -c "CREATE ROLE admin WITH SUPERUSER LOGIN PASSWORD 'admin'"
+    fi
+
     # Needed when using a MySQL backend
     # mysql -u root -e "CREATE DATABASE glance CHARACTER SET utf8;"
     sudo -u postgres createdb glance