installing the config files

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 36 insertions, 5 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 90810336539f..738ee50e2f05 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.9 2013/06/06 19:22:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.10 2013/06/24 20:40:31 prometheanfire Exp $
+
+*glance-2013.1.2-r1 (24 Jun 2013)
+*glance-2012.2.4-r1 (24 Jun 2013)
+
+  24 Jun 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2012.2.4-r1.ebuild, +glance-2013.1.2-r1.ebuild,
+  -glance-2012.2.4.ebuild, -glance-2013.1.2.ebuild:
+  installing the config files
 
 *glance-2013.1.2 (06 Jun 2013)
 
diff --git a/app-admin/glance/glance-2012.2.4.ebuild b/app-admin/glance/glance-2012.2.4-r1.ebuild
index 1a257ad8c92e..ebe04e699d3f 100644
--- a/app-admin/glance/glance-2012.2.4.ebuild
+++ b/app-admin/glance/glance-2012.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4.ebuild,v 1.1 2013/05/10 02:57:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r1.ebuild,v 1.1 2013/06/24 20:40:31 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -63,4 +63,17 @@ python_install() {
 	dodir /var/run/glance /var/log/nova /var/lock/nova
 	#removed because it conflicts with glanceclient, which we install in rdepend
 	rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
+
+	keepdir /etc/glance
+	insinto /etc/glance
+
+	doins "etc/glance-api-paste.ini"
+	doins "etc/glance-api.conf"
+	doins "etc/glance-cache.conf"
+	doins "etc/glance-registry-paste.ini"
+	doins "etc/glance-registry.conf"
+	doins "etc/glance-scrubber.conf"
+	doins "etc/logging.cnf.sample"
+	doins "etc/policy.json"
+	doins "etc/schema-image.json"
 }
diff --git a/app-admin/glance/glance-2013.1.2.ebuild b/app-admin/glance/glance-2013.1.2-r1.ebuild
index 27cfe01c0a73..df8fa277296b 100644
--- a/app-admin/glance/glance-2013.1.2.ebuild
+++ b/app-admin/glance/glance-2013.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2.ebuild,v 1.1 2013/06/06 19:22:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r1.ebuild,v 1.1 2013/06/24 20:40:31 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -67,6 +67,16 @@ python_install() {
 
 	diropts -m 0750
 	dodir /var/run/glance /var/log/nova /var/lock/nova
-	#removed because it conflicts with glanceclient, which we install in rdepend
-	rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
+	keepdir /etc/glance
+	insinto /etc/glance
+
+	doins "etc/glance-api-paste.ini"
+	doins "etc/glance-api.conf"
+	doins "etc/glance-cache.conf"
+	doins "etc/glance-registry-paste.ini"
+	doins "etc/glance-registry.conf"
+	doins "etc/glance-scrubber.conf"
+	doins "etc/logging.cnf.sample"
+	doins "etc/policy.json"
+	doins "etc/schema-image.json"
 }