Merge lp:~dan-prince/glance/ubuntu-glance-api-version into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Dan Prince]

Updates to support the new glance-api.conf and glance-registry.conf files.

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-06 13:24:19 +0000
+++ debian/changelog	2011-05-14 18:32:33 +0000
@@ -9,6 +9,9 @@
 
   [ Dan Prince ]
   * Add support for DEB_BUILD_OPTIONS=nocheck,nodocs.
+  * Updated to support new glance-api.conf and glance-registry.conf files.
+  * Updated log file locations in the upstart scripts to match new config
+    file defaults.
 
  -- Soren Hansen <[e-mail]>  Thu, 05 May 2011 15:17:10 +0200
 

=== modified file 'debian/glance.glance-api.upstart'
--- debian/glance.glance-api.upstart	2011-04-12 10:18:56 +0000
+++ debian/glance.glance-api.upstart	2011-05-14 18:32:33 +0000
@@ -6,4 +6,4 @@
 
 respawn
 
-exec su -c "glance-api" glance >> /var/log/glance/glance-api.log 2>&1
+exec su -c "glance-api" glance >> /var/log/glance/api.log 2>&1

=== modified file 'debian/glance.glance-registry.upstart'
--- debian/glance.glance-registry.upstart	2011-04-12 10:18:56 +0000
+++ debian/glance.glance-registry.upstart	2011-05-14 18:32:33 +0000
@@ -6,4 +6,4 @@
 
 respawn
 
-exec su -c "glance-registry" glance >> /var/log/glance/glance-registry.log 2>&1
+exec su -c "glance-registry" glance >> /var/log/glance/registry.log 2>&1

=== modified file 'debian/glance.install'
--- debian/glance.install	2011-04-12 10:21:42 +0000
+++ debian/glance.install	2011-05-14 18:32:33 +0000
@@ -1,2 +1,3 @@
 usr/bin/*
-etc/glance.conf.sample etc/glance
+etc/glance-api.conf etc/glance
+etc/glance-registry.conf etc/glance

=== modified file 'debian/glance.postinst'
--- debian/glance.postinst	2011-05-05 13:17:26 +0000
+++ debian/glance.postinst	2011-05-14 18:32:33 +0000
@@ -9,7 +9,7 @@
         adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance
 	fi
 	chown glance -R /var/lib/glance /var/log/glance
-	if ! grep sql_connection /etc/glance/glance.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
+	if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
 	then
 		su -c 'glance-manage db_sync' glance
 	fi

=== modified file 'debian/patches/sql_conn.patch'
--- debian/patches/sql_conn.patch	2011-04-12 10:21:42 +0000
+++ debian/patches/sql_conn.patch	2011-05-14 18:32:33 +0000
@@ -1,8 +1,8 @@
 Index: glance-2011.2~bzr108/etc/glance.conf.sample
 ===================================================================
---- glance-2011.2~bzr108.orig/etc/glance.conf.sample
-+++ glance-2011.2~bzr108/etc/glance.conf.sample
-@@ -62,7 +62,7 @@
+--- glance-2011.2~bzr131.orig/etc/glance-registry.conf
++++ glance-2011.2~bzr131/etc/glance-registry.conf
+@@ -18,7 +18,7 @@
  # SQLAlchemy connection string for the reference implementation
  # registry server. Any valid SQLAlchemy connection string is fine.
  # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine

=== modified file 'debian/rules'
--- debian/rules	2011-05-05 20:22:21 +0000
+++ debian/rules	2011-05-14 18:32:33 +0000
@@ -16,7 +16,6 @@
 
 override_dh_install:
 	dh_install
-	mv debian/glance/etc/glance/glance.conf.sample debian/glance/etc/glance/glance.conf
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test: