diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2016-11-28 19:33:48 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2016-11-28 19:52:01 -0600 |
| commit | 77ddc2b35031e985b386412fa19320625d9a6b74 (patch) | |
| tree | 62091e3782b12dde38d61e8f40559093a39ef30d /sys-cluster | |
| parent | dev-python/spark-parser-1.5.1: sed in python_prepare_all is no longer needed ... (diff) | |
| download | gentoo-77ddc2b35031e985b386412fa19320625d9a6b74.tar.gz gentoo-77ddc2b35031e985b386412fa19320625d9a6b74.tar.bz2 gentoo-77ddc2b35031e985b386412fa19320625d9a6b74.zip | |
sys-cluster/nova: fixing python_install methods
Package-Manager: portage-2.3.0
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/nova/nova-2016.1.9999.ebuild | 22 | ||||
| -rw-r--r-- | sys-cluster/nova/nova-2016.2.9999.ebuild | 22 |
2 files changed, 26 insertions, 18 deletions
diff --git a/sys-cluster/nova/nova-2016.1.9999.ebuild b/sys-cluster/nova/nova-2016.1.9999.ebuild index d9b2ff6c7b3a..8dfe35015f6f 100644 --- a/sys-cluster/nova/nova-2016.1.9999.ebuild +++ b/sys-cluster/nova/nova-2016.1.9999.ebuild @@ -152,8 +152,8 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_install() { - distutils-r1_python_install +python_install_all() { + distutils-r1_python_install_all if use !compute-only; then for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do @@ -172,19 +172,14 @@ python_install() { newins "${DISTDIR}/mitaka-nova.conf.sample" "nova.conf.sample" doins "${FILESDIR}/nova-compute.conf" doins "${S}/etc/nova/"* - #rootwrap filters + # rootwrap filters insopts -m 0644 insinto /etc/nova/rootwrap.d newins "${FILESDIR}/etc.mitaka/rootwrap.d/api-metadata.filters" "api-metadata.filters" newins "${FILESDIR}/etc.mitaka/rootwrap.d/compute.filters" "compute.filters" newins "${FILESDIR}/etc.mitaka/rootwrap.d/network.filters" "network.filters" - #copy migration conf file (not coppied on install via setup.py script) - insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/ - doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" - #copy the CA cert dir (not coppied on install via setup.py script) - cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed" - #add sudoers definitions for user nova + # add sudoers definitions for user nova insinto /etc/sudoers.d/ insopts -m 0600 -o root -g root doins "${FILESDIR}/nova-sudoers" @@ -198,6 +193,15 @@ python_install() { fi } +python_install() { + distutils-r1_python_install + # copy migration conf file (not coppied on install via setup.py script) + insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" + doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" + # copy the CA cert dir (not coppied on install via setup.py script) + cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" +} + pkg_postinst() { if use iscsi ; then elog "iscsid needs to be running if you want cinder to connect" diff --git a/sys-cluster/nova/nova-2016.2.9999.ebuild b/sys-cluster/nova/nova-2016.2.9999.ebuild index 59fded1dcd01..b09531c56916 100644 --- a/sys-cluster/nova/nova-2016.2.9999.ebuild +++ b/sys-cluster/nova/nova-2016.2.9999.ebuild @@ -164,8 +164,8 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_install() { - distutils-r1_python_install +python_install_all() { + distutils-r1_python_install_all if use !compute-only; then for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do @@ -184,19 +184,14 @@ python_install() { newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample" doins "${FILESDIR}/nova-compute.conf" doins "${S}/etc/nova/"* - #rootwrap filters + # rootwrap filters insopts -m 0644 insinto /etc/nova/rootwrap.d doins "etc/nova/rootwrap.d/api-metadata.filters" doins "etc/nova/rootwrap.d/compute.filters" doins "etc/nova/rootwrap.d/network.filters" - #copy migration conf file (not coppied on install via setup.py script) - insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/ - doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" - #copy the CA cert dir (not coppied on install via setup.py script) - cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed" - #add sudoers definitions for user nova + # add sudoers definitions for user nova insinto /etc/sudoers.d/ insopts -m 0600 -o root -g root doins "${FILESDIR}/nova-sudoers" @@ -210,6 +205,15 @@ python_install() { fi } +python_install() { + distutils-r1_python_install + # copy migration conf file (not coppied on install via setup.py script) + insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" + doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" + # copy the CA cert dir (not coppied on install via setup.py script) + cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" +} + pkg_postinst() { if use iscsi ; then elog "iscsid needs to be running if you want cinder to connect" |