[gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/

[Matt Thode]

commit:     3a2686496cf74253b92294887d76735fa8b831dd
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 18:38:40 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 18:39:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a268649

sys-cluster/cinder: fix policy in code stuff

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-cluster/cinder/cinder-12.0.0.ebuild      | 1 -
 sys-cluster/cinder/cinder-2018.1.9999.ebuild | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-cluster/cinder/cinder-12.0.0.ebuild 
b/sys-cluster/cinder/cinder-12.0.0.ebuild
index 3b14eed864d..7c4c55c46c3 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 3b14eed864d..79bd9d4e734 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"