From: Matthew Thode <prometheanfire@gentoo.org>
Date: Wed, 7 Mar 2018 18:38:40 +0000 (-0600)
Subject: sys-cluster/cinder: fix policy in code stuff
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a2686496cf74253b92294887d76735fa8b831dd;p=gentoo.git

sys-cluster/cinder: fix policy in code stuff

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---

diff --git a/sys-cluster/cinder/cinder-12.0.0.ebuild b/sys-cluster/cinder/cinder-12.0.0.ebuild
index 3b14eed864d4..7c4c55c46c39 100644
--- a/sys-cluster/cinder/cinder-12.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-12.0.0.ebuild
@@ -196,7 +196,6 @@ python_install_all() {
 	doins "etc/cinder/logging_sample.conf"
 	doins "etc/cinder/rootwrap.conf"
 	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
 	doins "etc/cinder/resource_filters.json"
 	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
diff --git a/sys-cluster/cinder/cinder-2018.1.9999.ebuild b/sys-cluster/cinder/cinder-2018.1.9999.ebuild
index 3b14eed864d4..79bd9d4e734e 100644
--- a/sys-cluster/cinder/cinder-2018.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2018.1.9999.ebuild
@@ -196,9 +196,8 @@ python_install_all() {
 	doins "etc/cinder/logging_sample.conf"
 	doins "etc/cinder/rootwrap.conf"
 	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
 	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
+	newins "${DISTDIR}/queens-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
 	doins "etc/cinder/rootwrap.d/volume.filters"