| 1 |
commit: 77ddc2b35031e985b386412fa19320625d9a6b74 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 01:33:48 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 01:52:01 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ddc2b3 |
| 7 |
|
| 8 |
sys-cluster/nova: fixing python_install methods |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-cluster/nova/nova-2016.1.9999.ebuild | 22 +++++++++++++--------- |
| 13 |
sys-cluster/nova/nova-2016.2.9999.ebuild | 22 +++++++++++++--------- |
| 14 |
2 files changed, 26 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/nova/nova-2016.1.9999.ebuild b/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 17 |
index d9b2ff6..8dfe350 100644 |
| 18 |
--- a/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 19 |
+++ b/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 20 |
@@ -152,8 +152,8 @@ python_prepare_all() { |
| 21 |
distutils-r1_python_prepare_all |
| 22 |
} |
| 23 |
|
| 24 |
-python_install() { |
| 25 |
- distutils-r1_python_install |
| 26 |
+python_install_all() { |
| 27 |
+ distutils-r1_python_install_all |
| 28 |
|
| 29 |
if use !compute-only; then |
| 30 |
for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
| 31 |
@@ -172,19 +172,14 @@ python_install() { |
| 32 |
newins "${DISTDIR}/mitaka-nova.conf.sample" "nova.conf.sample" |
| 33 |
doins "${FILESDIR}/nova-compute.conf" |
| 34 |
doins "${S}/etc/nova/"* |
| 35 |
- #rootwrap filters |
| 36 |
+ # rootwrap filters |
| 37 |
insopts -m 0644 |
| 38 |
insinto /etc/nova/rootwrap.d |
| 39 |
newins "${FILESDIR}/etc.mitaka/rootwrap.d/api-metadata.filters" "api-metadata.filters" |
| 40 |
newins "${FILESDIR}/etc.mitaka/rootwrap.d/compute.filters" "compute.filters" |
| 41 |
newins "${FILESDIR}/etc.mitaka/rootwrap.d/network.filters" "network.filters" |
| 42 |
- #copy migration conf file (not coppied on install via setup.py script) |
| 43 |
- insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/ |
| 44 |
- doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
| 45 |
- #copy the CA cert dir (not coppied on install via setup.py script) |
| 46 |
- cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed" |
| 47 |
|
| 48 |
- #add sudoers definitions for user nova |
| 49 |
+ # add sudoers definitions for user nova |
| 50 |
insinto /etc/sudoers.d/ |
| 51 |
insopts -m 0600 -o root -g root |
| 52 |
doins "${FILESDIR}/nova-sudoers" |
| 53 |
@@ -198,6 +193,15 @@ python_install() { |
| 54 |
fi |
| 55 |
} |
| 56 |
|
| 57 |
+python_install() { |
| 58 |
+ distutils-r1_python_install |
| 59 |
+ # copy migration conf file (not coppied on install via setup.py script) |
| 60 |
+ insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" |
| 61 |
+ doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
| 62 |
+ # copy the CA cert dir (not coppied on install via setup.py script) |
| 63 |
+ cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" |
| 64 |
+} |
| 65 |
+ |
| 66 |
pkg_postinst() { |
| 67 |
if use iscsi ; then |
| 68 |
elog "iscsid needs to be running if you want cinder to connect" |
| 69 |
|
| 70 |
diff --git a/sys-cluster/nova/nova-2016.2.9999.ebuild b/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 71 |
index 59fded1..b09531c 100644 |
| 72 |
--- a/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 73 |
+++ b/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 74 |
@@ -164,8 +164,8 @@ python_prepare_all() { |
| 75 |
distutils-r1_python_prepare_all |
| 76 |
} |
| 77 |
|
| 78 |
-python_install() { |
| 79 |
- distutils-r1_python_install |
| 80 |
+python_install_all() { |
| 81 |
+ distutils-r1_python_install_all |
| 82 |
|
| 83 |
if use !compute-only; then |
| 84 |
for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
| 85 |
@@ -184,19 +184,14 @@ python_install() { |
| 86 |
newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample" |
| 87 |
doins "${FILESDIR}/nova-compute.conf" |
| 88 |
doins "${S}/etc/nova/"* |
| 89 |
- #rootwrap filters |
| 90 |
+ # rootwrap filters |
| 91 |
insopts -m 0644 |
| 92 |
insinto /etc/nova/rootwrap.d |
| 93 |
doins "etc/nova/rootwrap.d/api-metadata.filters" |
| 94 |
doins "etc/nova/rootwrap.d/compute.filters" |
| 95 |
doins "etc/nova/rootwrap.d/network.filters" |
| 96 |
- #copy migration conf file (not coppied on install via setup.py script) |
| 97 |
- insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/ |
| 98 |
- doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
| 99 |
- #copy the CA cert dir (not coppied on install via setup.py script) |
| 100 |
- cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed" |
| 101 |
|
| 102 |
- #add sudoers definitions for user nova |
| 103 |
+ # add sudoers definitions for user nova |
| 104 |
insinto /etc/sudoers.d/ |
| 105 |
insopts -m 0600 -o root -g root |
| 106 |
doins "${FILESDIR}/nova-sudoers" |
| 107 |
@@ -210,6 +205,15 @@ python_install() { |
| 108 |
fi |
| 109 |
} |
| 110 |
|
| 111 |
+python_install() { |
| 112 |
+ distutils-r1_python_install |
| 113 |
+ # copy migration conf file (not coppied on install via setup.py script) |
| 114 |
+ insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" |
| 115 |
+ doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
| 116 |
+ # copy the CA cert dir (not coppied on install via setup.py script) |
| 117 |
+ cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" |
| 118 |
+} |
| 119 |
+ |
| 120 |
pkg_postinst() { |
| 121 |
if use iscsi ; then |
| 122 |
elog "iscsid needs to be running if you want cinder to connect" |
Archives