[openstack-savanna/el6] 0.3

[matt]

commit d2680d87049ddaaf31423c2ee3df737d771fce6e
Author: Matthew Farrellee <matt at redhat.com>
Date:   Thu Oct 17 07:21:17 2013 -0400

    0.3

 .gitignore                 |    1 +
 nova-keypairs-get.patch    |   25 -------------------------
 openstack-savanna-api.init |    3 ++-
 openstack-savanna.spec     |   14 ++++++++++----
 sources                    |    2 +-
 5 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1dbd81..99994a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /savanna-0.3.a252.ga1714e0.tar.gz
 /savanna-0.3.a274.gabf778f.tar.gz
 /savanna-0.3.rc3.tar.gz
+/savanna-0.3.tar.gz
diff --git a/openstack-savanna-api.init b/openstack-savanna-api.init
index 17500ed..8ee4b3b 100644
--- a/openstack-savanna-api.init
+++ b/openstack-savanna-api.init
@@ -21,6 +21,7 @@
 prog=openstack-savanna-api
 exec="/usr/bin/savanna-api"
 config="/etc/savanna/savanna.conf"
+logfile="/var/log/savanna/api.log"
 pidfile="/var/run/savanna/savanna-api.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -31,7 +32,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user savanna --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
+    daemon --user savanna --pidfile $pidfile "$exec --config-file $config --log-file $logfile --verbose &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index 7eb282f..229eae4 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,14 +1,12 @@
 Name:          openstack-savanna
 Version:       0.3
-%define suf    .rc3
-Release:       0.2%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
 Source0:       http://tarballs.openstack.org/savanna/savanna-%{version}%{?suf}.tar.gz
 Source1:       openstack-savanna-api.init
 Patch0:        sqlalchemy0.7-magic.patch
-Patch1:        nova-keypairs-get.patch
 BuildArch:     noarch
 
 BuildRequires: python-pbr
@@ -55,7 +53,6 @@ clusters on OpenStack.
 %prep
 %setup -q -n savanna-%{version}%{?suf}
 %patch0
-%patch1 -p1
 rm -rf savanna.egg-info
 rm -f {test-,}requirements.txt
 sed -i 's/0.5.21/0.5.19/' setup.py
@@ -91,6 +88,8 @@ sed -i -e "s,^connection=.*,connection=sqlite:///$HOME/savanna-server.db," $CONF
 # Do not package tests
 rm -rf %{buildroot}%{python_sitelib}/savanna/tests
 
+mkdir -p -m0755 %{buildroot}/%{_var}/log/savanna
+
 
 #%%check
 #%%{__python} setup.py test
@@ -147,12 +146,19 @@ fi
 %{_datadir}/savanna/savanna.conf.sample-full
 %{python_sitelib}/savanna
 %{python_sitelib}/savanna-%{version}%{?suf}-py?.?.egg-info
+%defattr(-,savanna,savanna,-)
+%dir %{_var}/log/savanna
+
 
 #
 # TODO:
 #  . _savanna-subprocess should be in libexec
 #
 %changelog
+* Sat Oct 19 2013 Matthew Farrellee <matt at redhat> - 0.3-1
+- 0.3 release
+- Enable logging into /var/log/savanna
+
 * Fri Oct 11 2013 Matthew Farrellee <matt at redhat> - 0.3-0.2
 - 0.3 rc3 build
 - Remove workaround patch for novaclient bug 1223934
diff --git a/sources b/sources
index f593404..379d362 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7da1fb47cd56d7915736aae2728cfc9c  savanna-0.3.rc3.tar.gz
+a3fdddc4fd955f71d9fcb5a7dc0ad270  savanna-0.3.tar.gz