add support for migrations with sqlalchemy-migrate

[sfa.git] / init.d / sfa

diff --git a/init.d/sfa b/init.d/sfa
index 6e1acb4..7cb510c 100755 (executable)
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -63,46 +63,44 @@ function postgresql_check () {
 DATE=$(date +"%Y-%m-%d-%H-%M-%S")
 
 # Dumps the database - optional argument to specify filename suffix
-function dump_sfa_db()
-{
+function dump_sfa_db() {
     if [ -n "$1" ] ; then suffix="-$1" ; else suffix="" ; fi
     dumpfile=/var/lib/pgsql/backups/$(date +"${SFA_DB_NAME}.${DATE}${suffix}.sql")
     pg_dump -U $SFA_DB_USER $SFA_DB_NAME > $dumpfile
     check
 }
 
-# Updates the database by applying all migration scripts in
-# /usr/share/sfa/migrations/N-up-*, where N is greater than the
-# current subversion. At least one of the migration scripts with the
-# same N must update sfa_db_version.subversion.
-function migrate_db()
-{
-    subversion=$(psql -U $SFA_DB_USER --quiet --tuples-only --no-align -c \
-                "SELECT subversion FROM sfa_db_version LIMIT 1" \
-                $SFA_DB_NAME 2>/dev/null || echo 0)
-    shopt -s nullglob
-    for file in /usr/share/sfa/migrations/[0-9]*-up-* ; do
-       script=$(basename $file)
-       index=${script%-up*}
-       extension=${script##*.}
-       if [ $index -gt $subversion ] ; then
-           if [ "$extension" = "sql" ] ; then
-               dialog " - $script (dbdumped)"
-               dump_sfa_db "before-$script"
-               psql -U $SFA_DB_USER -f $file $SFA_DB_NAME
-           elif [ -x $file ] ; then
-               dialog " - $script (dbdumped)"
-               dump_sfa_db "before-$script"
-               $file
-           else
-               dialog "\nWarning: migration $file not executable"
-           fi
-           check
-       fi
-    done
-}
+# Updates the database by applying migration scripts
+# using sqlalchemy-migrate for this 
+# migrate repo is /usr/share/sfa/migrations/
+# and version scripts are thus in /usr/share/sfa/migrations/versions/
+function db_migrate() {
 
+    # only if enabled
+    [ "$SFA_DB_ENABLED" == 1 ] || return
 
+    alchemy_url="postgresql+psycopg2://${SFA_DB_USER}:${SFA_DB_PASSWORD}@:${SFA_DB_PORT}/${SFA_DB_NAME}"
+    migrate_repo="/usr/share/sfa/migrations"
+    # check if under version control, and initialize it otherwise
+    if ! sqlalchemy-migrate db_version --url=$alchemy_url $migrate_repo >& /dev/null ; then
+       # at this point it would make sense to
+       # check that the 'users' table is in the db
+       # if not, backup/dump, and run a nuke/import
+       # and then only init the db version to 0
+       echo -n $"version init in db ${SFA_DB_NAME}" 
+       sqlalchemy-migrate version_control --url=$alchemy_url $migrate_repo 
+    fi
+    version_before=$(sqlalchemy-migrate db_version --url=$alchemy_url $migrate_repo)
+    check
+    sqlalchemy-migrate upgrade --url=$alchemy_url $migrate_repo 2> /dev/null
+    check
+    version_after=$(sqlalchemy-migrate db_version --url=$alchemy_url $migrate_repo)
+    if [ "$version_before" != "$version_after" -o "$ERRORS" != 0 ] ; then
+       MESSAGE=$"DB version: $version_before -> $version_after"
+       echo -n "$MESSAGE"
+       [ "$ERRORS" == 0 ] && success "$MESSAGE" || failure "$MESSAGE" ; echo
+    fi
+}
 
 # Regenerate configuration files - almost verbatim from plc.init
 function reload () {
@@ -211,6 +209,10 @@ function db_start () {
            echo "host $SFA_DB_NAME $SFA_DB_USER 127.0.0.1/32 password"
            [ -n "$registry_ip" ] && echo "host $SFA_DB_NAME $SFA_DB_USER ${registry_ip}/32 password"
        ) >>$pghba_conf
+
+    if [ "$SFA_GENERIC_FLAVOUR" == "openstack" ] ; then
+        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pghba_conf
+    fi   
        
        # Fix ownership (sed -i changes it)
        chown postgres:postgres $postgresql_conf $pghba_conf
@@ -257,9 +259,6 @@ function db_start () {
     if ! psql -U $SFA_DB_USER -c "" $SFA_DB_NAME >/dev/null 2>&1 ; then
        createdb -U postgres --template=template0 --encoding=UNICODE --owner=$SFA_DB_USER $SFA_DB_NAME
        check
-        # install db schema
-        psql -U $SFA_DB_USER -f /usr/share/sfa/sfa.sql $SFA_DB_NAME
-       check
     fi
     check
 
@@ -289,8 +288,7 @@ function start() {
     reload
 
     db_start
-
-    migrate_db
+    db_migrate
 
     # install peer certs
     action $"SFA installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS