opendev/system-config
Code Issues Proposed changes

Merge "Openstackid track site version"

Browse Source
This commit is contained in:
Jenkins 2014-03-20 19:55:17 +00:00 committed by Gerrit Code Review
commit d9b7c218a6
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/openstackid/files/functions
View File

@ -31,6 +31,10 @@ function site_init() {
chown $FILE_OWNER:$FILE_GROUP $SITE_ROOT/$dir chown $FILE_OWNER:$FILE_GROUP $SITE_ROOT/$dir
done done
target_dir="$SITE_ROOT/slot0" target_dir="$SITE_ROOT/slot0"
# fetch catalog and write actual version
fetch_catalog
RELEASE_VERSION=`catalog_get_version`
echo $RELEASE_VERSION > $SITE_ROOT/slot0/release
# fetch and extract release tarball # fetch and extract release tarball
umask 0027 umask 0027
if [[ $SOURCE_TARBALL == http* ]]; then if [[ $SOURCE_TARBALL == http* ]]; then
@ -86,8 +90,26 @@ function site_status() {
exit 1 exit 1
fi fi
else else
echo "INSTALLED" fetch_catalog
REMOTE_VERSION=`catalog_get_version`
RELEASE_VERSION=$(head -n 1 $SITE_ROOT/w/release)
if [ "$REMOTE_VERSION" == "$RELEASE_VERSION" ]; then
echo "INSTALLED [$RELEASE_VERSION]"
else
echo "UPDATE AVAILABLE [$RELEASE_VERSION-$REMOTE_VERSION]"
fi fi
fi
}
function fetch_catalog() {
curl --silent $SOURCE_ROOT > $SITE_ROOT/releases.lst
grep -q "^<!DOCTYPE HTML PUBLIC" $SITE_ROOT/releases.lst
}
function catalog_get_version() {
RAW_LINE=`cat $SITE_ROOT/releases.lst | grep "$RELEASE_NAME" | sed "s/<[^>]\+>//g" | sed -r "s/^$RELEASE_NAME//"`
RELEASE_DATE=`echo $RAW_LINE | awk '{ print $1 " " $2}'`
echo $RELEASE_DATE
} }
function site_update() { function site_update() {

2
modules/openstackid/templates/openstackid.conf.erb
View File

@ -1,3 +1,5 @@
SITE_ROOT=/srv/openstackid SITE_ROOT=/srv/openstackid
SOURCE_TARBALL=http://tarballs.openstack.org/openstackid/openstackid-latest.tar.gz SOURCE_TARBALL=http://tarballs.openstack.org/openstackid/openstackid-latest.tar.gz
LARAVEL_ENV=dev LARAVEL_ENV=dev
RELEASE_NAME=openstackid-latest.tar.gz
SOURCE_ROOT=http://tarballs.openstack.org/openstackid/