diff options
Diffstat (limited to 'sys-cluster')
45 files changed, 112 insertions, 3025 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex 0cac28e0e705..e3cd6c8831e6 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index 26cbb5b4dc27..fea0bfd51629 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,26 +1,7 @@ -AUX cinder.initd 757 BLAKE2B 03472ae3a189ad0f9c61065ae3c9773fc9b90f690bf67b8ec1ea4dbfc9e36970e793d0bd7ae86ebbc91a8273275e87cd1de3cc9580a300e7d71daeba640ce7b8 SHA512 4307742f874357d322d075e59adeaa6abe3cc099df5fcea4507d8803cb9fe662a83d149fa57002e290c9f88a064c566984772fedf5786988d922fdd687df59d8 -AUX cinder.initd-2 494 BLAKE2B 18b8972f2adef56c54456099a5605cb4138e5a655d9fd2497d24c08146884bfcbf5f6bfea1de1e5c1969fff55aebff66d70f20c9b4367a2383f073bd82455bff SHA512 04672a7aa12ece606836787cf28992155f15e76ba4038379ed0767c3c9fe9e83a5008a2357c272f522341bf3e7d3b2a60edd9095acf7e66ef16eb45f1e8a06e4 +AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 -AUX etc.liberty/api-httpd.conf 572 BLAKE2B 6fdddbad35a8bc8f536a3b197004d01ee26a0453e3b6d1b31ed94a52dc61f1b7e0c09f22e86117436ddb45dcb9ebb5a3b5a68430b553d550774b522ae85d2c89 SHA512 47e86f6245c2d241d9573932e26391a455d546f7ef0cd94c608c563ea4be4599711fe783c8735bcd0095ad57a55409ae96dcf938ee95024b2225ab8450cfc5b1 -AUX etc.liberty/api-paste.ini 1865 BLAKE2B 5083e7eb79009735178e708e5fe10b64737d6304cc11858426ae7b63406c01d630b61e7e9c2f685073e723ff10f2f32f4e04e1c4192094b72ee8fda5e0125ee1 SHA512 6ceee5c19dffb8909f7372e9388215bc02acfa69e7d07ccc8278c8702ca25c65be869a8cbea1b2b67f8602d24f0d5bbe07e26d19a44febbb5a9a627e3c3cbad2 -AUX etc.liberty/logging_sample.conf 1758 BLAKE2B 3d4a08b5bc01fd3b44c2659ae473bfb34e55a09e0514ca6ca2e107b2a9e40d2eb7d405cc349935413fbbafeb588680bc6b79fd6db6f1e563dceb48fe231866a9 SHA512 7e5d747b6ceb6458e332fe2741a45f7c095f0bb3c0b4c030839a15f4eb8a1b4e667062ed069ba80901ee496d85aa153c694ef99573650e4426eda0e2de454141 -AUX etc.liberty/policy.json 4623 BLAKE2B da2096563f5293ae348227208ef7218d605ea7f66ae602316a3dfb20a214d02eb68d9708beb84a843429a67c3189a1b447a37e87f9796d34e294ea7261306c91 SHA512 441a7c6d4a7ff9697ab4498184e4e4daf4f35884aa1e00c44152ee933a924f022008d32e8a5348cad341b50275404cb95c90bc2f3d9f015b77ea61b61764e730 -AUX etc.liberty/rootwrap.conf 973 BLAKE2B e4448e6fea2bb4e5eee4429d548e579a8948de61a15914f6f35d28b7d2902743c1a476e7efe3e6c7fd3fa07f6a000383edbe8ab1ebb4a0a035757b7bc432a5ec SHA512 f4a52193883bae792e202711979c7d850f5823ca1bdca4fa6b32e89f0ea13af92e8065ffb39c363b2ce6220c039d1a1ff23fa1af381e68714eba6ff76c16a9f7 -AUX etc.liberty/rootwrap.d/volume.filters 9478 BLAKE2B 612af74195df43ae5b5ae1cfa0d765a425167189e393c60fa170716e21bb94fa88cd249658408cd58d33a2a8b4303a896b73b8442e62b8a4e6bad57f1c7353e8 SHA512 ed5f9456eee9c72aa5e72a745f6f4958bade85d34cd7ee6cdf6c082d69a20bf4f9e46e600b3944dcf63cb744d3ffb3c9c4412e50b8762f254d7b59bb561500d5 -DIST cinder-10.0.6.tar.gz 4624145 BLAKE2B c3e12c4f49b9b06b674d12354e867328eaaef565930ac1d3078c4611f14f61463d458a2bfd679a0a6cb8ce5b677b037618a800d229bf352797b20b57c8383e6b SHA512 28c84260909d0c1a9b0cd6a7409dad3e09d0d7bd662b8ca61c6c3ca04fb797723bc0f4df7db3a6951d1ce354a84b907bf1832190c02a5992c8ac70cf95fb00b9 DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014 SHA512 6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6 -DIST cinder-9.1.4.tar.gz 4195597 BLAKE2B a35b3c588d0589baf2887ebe6c9c6c4803a6819476c822fa3d314b8cb74f4fabae19cf224a3b9dc2c6255338eff6413be189e3555f5e49578451604f091169ba SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9 -DIST newton-cinder-policy.json 6412 BLAKE2B 90c6a2733b0c20a95375e9a588c311e48f9f189aff43ce9a89a808e6693b2f14ca0485fbea4d000674414081171989dc8050c0079e4e137f728decbdf8a5cec0 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56 -DIST newton-cinder-volume.filters 11025 BLAKE2B ac87bb2aaab3bd492ea2f7ce7526e7ff444778ce516c71bce769f2cff1badebe7cbf520c604a0193b03f615e0d34dff21cee34f4798cc03151711b205924728b SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d -DIST newton-cinder.conf.sample 50793 BLAKE2B 4537ae2f7dc70fd6711a0a07a301b036af8eab72372317a96355956fa05f67562374a5ad45b60d84d569f5c52a3d36b34fde4d2defcde4d11e69c99a64e22997 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db -DIST ocata-cinder-policy.json 6614 BLAKE2B 7b47da231386543e6fa438796a747882daa8b39453b6940c9ce454e3989ccc76cec9aebdc96b0820786cad978c6ed834bca6e25f812c8e07028edf100dfba299 SHA512 6a3da28674e7bf828a2be8de0b41e6abe59567d0abf2a41781580ba611ca888e072960f3e702e834a1599e6bbb49beb1cd37f7a32e35afaf8dfc73f2852e2302 -DIST ocata-cinder-volume.filters 11067 BLAKE2B 84e642296960124126155ab725cbbb1754d8303bcb97d85117123671fbf2e96e84c1b38f74d88f6adda9a7f89a784669f45dcb9fadabdace30fc4f53c89d34e5 SHA512 9600ca77a63db04844ab9d658ffd0d97abe1c669d91f69d126b364b2700d749cd45d7df1e31ffd7e80698157e9267c3138cae098f36d77995bab73afdf32ff9f -DIST ocata-cinder.conf.sample 173024 BLAKE2B 11c53b4507d8ad53cfb49fa4c79760f2d3d8bf65f142a4bdec6731e732e5503a217ae5ab1c7220f73fea4ff2d91b5a84b6230484df672b5022c66d7f4f3eefa0 SHA512 bbecf45ad20b3193023a137b5c3237dfc15bd6a232dda5de631096bf55916eb0fffba7506eeffdc1a3c848ac042cb286dea44387ff0eef84ec7bbcaffb4aa58e DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654 -EBUILD cinder-10.0.6.ebuild 7077 BLAKE2B 7a79cf9f50919344ac2cbda06aa4df24000cd2c0fd62208da375567cb579b9d06576de2de47b53bc5fd6f0cc8ac98fe5d3e5e8915003381895c67c3ddf9a9600 SHA512 3f1927bd233f73687f25d27d99455fbea611e12e335295eabf9752cc287cf5fa128b2d43f49d08186a0f61dda7f935338b81fc63a534292ad5170b94827ea458 -EBUILD cinder-11.0.2.ebuild 7750 BLAKE2B 1cc62670da2205ba55edac8f12048c394079865cbad2debfe705c55c7ac3463c597ef46b2f201ecac0cebfd16ef37a6c7e17faf005ac1b4ffe9a16699d1fdc2d SHA512 3e0c7195e8081d95558be1e499813c639fc4efec173ac677f1157fa4ab6a07e31939357bc18fb48e9a99171804e374d6d07bf027b7d870b630be9ffac6182737 -EBUILD cinder-2016.2.9999.ebuild 7156 BLAKE2B 54ba18a47cf0b4af02c3cd66c6719426f3e74ecc69ca3caa232b905d80f5213ef3dfc9252b3397a09c2708022c8a97097f2af78ad12afc240532c4e14a1f0bbb SHA512 e4f341ae8f2cf9a6e3d4c59a8a84f7877bdee83dfd957fd9dc6d0073cd71befd67da1783e3875d68a750b30269903e6ea4184531a189e4b067c237d5b261d6cb -EBUILD cinder-2017.1.9999.ebuild 7102 BLAKE2B e8ca1d59c278908d80c87550f86af56e4794a5815778501c4b53f04efae241c27eabfcc8ec8796f6267768c66955ad244286f075a31a20d9d98c325c7afe7bf7 SHA512 fe32fd7e9aa2320198b8fa4ecfb0d69fa1455c4e98ded2723ea84a33851f2e3c13959a586f7eb34879b09f49b249a7d43e317c0473d01cb7ec9817487737ae15 -EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B 9a2af8d9967a80c8362cd9ed7332b7c8d6be901a2816d456131f8c289c09bfef8ead5e8169673e092d14cc95f47fca173e2f2059a4b06a5a131fb31629b0a196 SHA512 9c967bac3ff3b02e94de987de3260cbdd67608fdc97da30b77ca41aab41c8dc3372b8f40c6fd1d4c23cabdc2352e780a32bdaa6bcac129d0160a469447eeeb0c -EBUILD cinder-9.1.4.ebuild 7224 BLAKE2B b75adf4693ec89606a8b87edab412dcb907e34231de29da62688f4c626b988304dd6fe1d1e02432e625c39bc4293c84ca4f5980fd997fbc6e7cfe5648b17727e SHA512 8582a735af86c73e64e49f365efee8fe06263f5e228ee83b2e576601b05aca1a500876381710613f1a5ed28ecab4031dae0619ac786f85cbb387e3f6efd19eb1 +EBUILD cinder-11.0.2.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d +EBUILD cinder-2017.2.9999.ebuild 7772 BLAKE2B 354ea7431e2e7d3bf9f5322f5b4f313de076977b0b33ef812cdeb9133983d7cbd50b569cf7c1451fc49857023e29741708fbd6a43c5e941c6a107771563ed9dd SHA512 c8a6db8c3d8c3c4ebca2d121250a6dde400a9cfd1092b17e2510e12656c4b945f4ffa8292f9893d06a29f4b1c5eac36202eb08d2b5d28997343070678d973c91 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9 diff --git a/sys-cluster/cinder/cinder-10.0.6.ebuild b/sys-cluster/cinder/cinder-10.0.6.ebuild deleted file mode 100644 index 50016f1ae5d7..000000000000 --- a/sys-cluster/cinder/cinder-10.0.6.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters -https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - dev-python/enum34[$(python_gen_usedep 'python2_7')] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - ~dev-python/suds-0.6[${PYTHON_USEDEP}] - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] - >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - app-emulation/qemu - sys-fs/sysfsutils" -# qemu is needed for image conversion - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="" - if use tcp; then - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " - fi - if use rdma; then - CONFIG_CHECK_MODULES+="INFINIBAND_ISER " - fi - if use infiniband; then - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" - fi - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewgroup cinder - enewuser cinder -1 -1 /var/lib/cinder cinder -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/cinder - dodir /etc/cinder/rootwrap.d - - for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd" cinder-${svc} - done - - insinto /etc/cinder - insopts -m0640 -o cinder -g cinder - doins "etc/cinder/api-httpd.conf" - doins "etc/cinder/logging_sample.conf" - doins "etc/cinder/rootwrap.conf" - doins "etc/cinder/api-paste.ini" - newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json" - newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample" - insinto /etc/cinder/rootwrap.d - newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters" - - dodir /var/log/cinder - fowners cinder:cinder /var/log/cinder - - #add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/cinder.sudoersd" cinder -} - -pkg_postinst() { - if use iscsi ; then - elog "Cinder needs tgtd to be installed and running to work with iscsi" - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" - fi -} diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild b/sys-cluster/cinder/cinder-11.0.2.ebuild index ed819298e2b2..b0f15626d2d7 100644 --- a/sys-cluster/cinder/cinder-11.0.2.ebuild +++ b/sys-cluster/cinder/cinder-11.0.2.ebuild @@ -177,7 +177,7 @@ python_install_all() { dodir /etc/cinder/rootwrap.d for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc} + newinitd "${FILESDIR}/cinder.initd" cinder-${svc} done insinto /etc/cinder diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild deleted file mode 100644 index b0cc1c89ab48..000000000000 --- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils git-r3 linux-info user - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters" -EGIT_REPO_URI="https://github.com/openstack/cinder.git" -EGIT_BRANCH="stable/newton" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" - -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - dev-python/enum34[$(python_gen_usedep 'python2_7')] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}] - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}] - !~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}] - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}] - ~dev-python/suds-0.6[${PYTHON_USEDEP}] - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}] - >=dev-python/os-win-0.2.3[${PYTHON_USEDEP}] - >=dev-python/tooz-1.28.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - app-emulation/qemu - sys-fs/sysfsutils" -# qemu is needed for image conversion - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="" - if use tcp; then - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " - fi - if use rdma; then - CONFIG_CHECK_MODULES+="INFINIBAND_ISER " - fi - if use infiniband; then - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" - fi - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewgroup cinder - enewuser cinder -1 -1 /var/lib/cinder cinder -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/cinder - dodir /etc/cinder/rootwrap.d - - for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd" cinder-${svc} - done - - insinto /etc/cinder - insopts -m0640 -o cinder -g cinder - doins "etc/cinder/api-httpd.conf" - doins "etc/cinder/logging_sample.conf" - doins "etc/cinder/rootwrap.conf" - doins "etc/cinder/api-paste.ini" - newins "${DISTDIR}/newton-cinder-policy.json" "policy.json" - newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample" - insinto /etc/cinder/rootwrap.d - newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters" - - dodir /var/log/cinder - fowners cinder:cinder /var/log/cinder - - #add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/cinder.sudoersd" cinder -} - -pkg_postinst() { - if use iscsi ; then - elog "Cinder needs tgtd to be installed and running to work with iscsi" - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" - fi -} diff --git a/sys-cluster/cinder/cinder-2017.1.9999.ebuild b/sys-cluster/cinder/cinder-2017.1.9999.ebuild deleted file mode 100644 index f7d1edd70082..000000000000 --- a/sys-cluster/cinder/cinder-2017.1.9999.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils git-r3 linux-info user - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters" -EGIT_REPO_URI="https://github.com/openstack/cinder.git" -EGIT_BRANCH="stable/ocata" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - dev-python/enum34[$(python_gen_usedep 'python2_7')] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - ~dev-python/suds-0.6[${PYTHON_USEDEP}] - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] - >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - app-emulation/qemu - sys-fs/sysfsutils" -# qemu is needed for image conversion - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="" - if use tcp; then - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " - fi - if use rdma; then - CONFIG_CHECK_MODULES+="INFINIBAND_ISER " - fi - if use infiniband; then - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" - fi - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewgroup cinder - enewuser cinder -1 -1 /var/lib/cinder cinder -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/cinder - dodir /etc/cinder/rootwrap.d - - for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd" cinder-${svc} - done - - insinto /etc/cinder - insopts -m0640 -o cinder -g cinder - doins "etc/cinder/api-httpd.conf" - doins "etc/cinder/logging_sample.conf" - doins "etc/cinder/rootwrap.conf" - doins "etc/cinder/api-paste.ini" - newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json" - newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample" - insinto /etc/cinder/rootwrap.d - newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters" - - dodir /var/log/cinder - fowners cinder:cinder /var/log/cinder - - #add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/cinder.sudoersd" cinder -} - -pkg_postinst() { - if use iscsi ; then - elog "Cinder needs tgtd to be installed and running to work with iscsi" - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" - fi -} diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild b/sys-cluster/cinder/cinder-2017.2.9999.ebuild index 9db27e401adc..2f6ae69b2644 100644 --- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild +++ b/sys-cluster/cinder/cinder-2017.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -178,7 +178,7 @@ python_install_all() { dodir /etc/cinder/rootwrap.d for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc} + newinitd "${FILESDIR}/cinder.initd" cinder-${svc} done insinto /etc/cinder diff --git a/sys-cluster/cinder/cinder-9.1.4.ebuild b/sys-cluster/cinder/cinder-9.1.4.ebuild deleted file mode 100644 index a4f99f386431..000000000000 --- a/sys-cluster/cinder/cinder-9.1.4.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters -https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" - -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - dev-python/enum34[$(python_gen_usedep 'python2_7')] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}] - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}] - !~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}] - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}] - ~dev-python/suds-0.6[${PYTHON_USEDEP}] - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}] - >=dev-python/os-win-0.2.3[${PYTHON_USEDEP}] - >=dev-python/tooz-1.28.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - app-emulation/qemu - sys-fs/sysfsutils" -# qemu is needed for image conversion - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="" - if use tcp; then - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " - fi - if use rdma; then - CONFIG_CHECK_MODULES+="INFINIBAND_ISER " - fi - if use infiniband; then - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" - fi - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewgroup cinder - enewuser cinder -1 -1 /var/lib/cinder cinder -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/cinder - dodir /etc/cinder/rootwrap.d - - for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd" cinder-${svc} - done - - insinto /etc/cinder - insopts -m0640 -o cinder -g cinder - doins "etc/cinder/api-httpd.conf" - doins "etc/cinder/logging_sample.conf" - doins "etc/cinder/rootwrap.conf" - doins "etc/cinder/api-paste.ini" - newins "${DISTDIR}/newton-cinder-policy.json" "policy.json" - newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample" - insinto /etc/cinder/rootwrap.d - newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters" - - dodir /var/log/cinder - fowners cinder:cinder /var/log/cinder - - #add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/cinder.sudoersd" cinder -} - -pkg_postinst() { - if use iscsi ; then - elog "Cinder needs tgtd to be installed and running to work with iscsi" - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" - fi -} diff --git a/sys-cluster/cinder/files/cinder.initd b/sys-cluster/cinder/files/cinder.initd index 0c86345a8a1e..b6a844a93c77 100644 --- a/sys-cluster/cinder/files/cinder.initd +++ b/sys-cluster/cinder/files/cinder.initd @@ -1,23 +1,17 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="Starts ${SVCNAME} service for OpenStack" command=/usr/bin/${SVCNAME} command_background=yes -command_args="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log" -pidfile=/var/run/cinder/${SVCNAME}.pid +command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log" +command_user="${CINDER_USER:-cinder}" +pidfile=/run/${SVCNAME}.pid required_files=/etc/cinder/cinder.conf - -start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}" +retry="SIGTERM/30" depend() { need net } - -start_pre() { - checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder} - checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_LOCK:-/var/lock/cinder} -} - diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2 deleted file mode 100644 index 31584dee9d23..000000000000 --- a/sys-cluster/cinder/files/cinder.initd-2 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Starts ${SVCNAME} service for OpenStack" - -command=/usr/bin/${SVCNAME} -command_background=yes -command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log" -command_user="${CINDER_USER:-cinder}" -pidfile=/run/${SVCNAME}.pid -required_files=/etc/cinder/cinder.conf -retry="SIGTERM/30" - -depend() { - need net -} diff --git a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf b/sys-cluster/cinder/files/etc.liberty/api-httpd.conf deleted file mode 100644 index f3555477acc7..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf +++ /dev/null @@ -1,16 +0,0 @@ -Listen 8776 -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" cinder_combined - -<VirtualHost *:8776> - WSGIDaemonProcess osapi_volume processes=2 threads=1 user=cinder display-name=%{GROUP} - WSGIProcessGroup osapi_volume - WSGIScriptAlias / /var/www/cgi-bin/cinder/osapi_volume - WSGIApplicationGroup %{GLOBAL} - WSGIPassAuthorization On - <IfVersion >= 2.4> - ErrorLogFormat "%{cu}t %M" - </IfVersion> - ErrorLog /var/log/apache2/cinder_error.log - CustomLog /var/log/apache2/cinder.log cinder_combined - -</VirtualHost> diff --git a/sys-cluster/cinder/files/etc.liberty/api-paste.ini b/sys-cluster/cinder/files/etc.liberty/api-paste.ini deleted file mode 100644 index b2822b044db0..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/api-paste.ini +++ /dev/null @@ -1,60 +0,0 @@ -############# -# OpenStack # -############# - -[composite:osapi_volume] -use = call:cinder.api:root_app_factory -/: apiversions -/v1: openstack_volume_api_v1 -/v2: openstack_volume_api_v2 - -[composite:openstack_volume_api_v1] -use = call:cinder.api.middleware.auth:pipeline_factory -noauth = request_id faultwrap sizelimit osprofiler noauth apiv1 -keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1 -keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1 - -[composite:openstack_volume_api_v2] -use = call:cinder.api.middleware.auth:pipeline_factory -noauth = request_id faultwrap sizelimit osprofiler noauth apiv2 -keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 -keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 - -[filter:request_id] -paste.filter_factory = oslo_middleware.request_id:RequestId.factory - -[filter:faultwrap] -paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory - -[filter:osprofiler] -paste.filter_factory = osprofiler.web:WsgiMiddleware.factory -hmac_keys = SECRET_KEY -enabled = yes - -[filter:noauth] -paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory - -[filter:sizelimit] -paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory - -[app:apiv1] -paste.app_factory = cinder.api.v1.router:APIRouter.factory - -[app:apiv2] -paste.app_factory = cinder.api.v2.router:APIRouter.factory - -[pipeline:apiversions] -pipeline = faultwrap osvolumeversionapp - -[app:osvolumeversionapp] -paste.app_factory = cinder.api.versions:Versions.factory - -########## -# Shared # -########## - -[filter:keystonecontext] -paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory - -[filter:authtoken] -paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf b/sys-cluster/cinder/files/etc.liberty/logging_sample.conf deleted file mode 100644 index f9a8deb1b3c1..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf +++ /dev/null @@ -1,93 +0,0 @@ -[loggers] -keys = root, cinder, taskflow, cinder_flow_utils - -[handlers] -keys = stderr, stdout, watchedfile, syslog, tasks, null - -[formatters] -keys = context, default - -[logger_root] -level = WARNING -handlers = null - -[logger_cinder] -level = INFO -handlers = stderr -qualname = cinder - -# Both of these are used for tracking what cinder and taskflow is doing with -# regard to flows and tasks (and the activity there-in). -[logger_cinder_flow_utils] -level = INFO -handlers = tasks,stderr -qualname = cinder.flow_utils - -[logger_taskflow] -level = INFO -handlers = tasks -qualname = taskflow - -[logger_amqplib] -level = WARNING -handlers = stderr -qualname = amqplib - -[logger_sqlalchemy] -level = WARNING -handlers = stderr -qualname = sqlalchemy -# "level = INFO" logs SQL queries. -# "level = DEBUG" logs SQL queries and results. -# "level = WARNING" logs neither. (Recommended for production systems.) - -[logger_boto] -level = WARNING -handlers = stderr -qualname = boto - -[logger_suds] -level = INFO -handlers = stderr -qualname = suds - -[logger_eventletwsgi] -level = WARNING -handlers = stderr -qualname = eventlet.wsgi.server - -[handler_stderr] -class = StreamHandler -args = (sys.stderr,) -formatter = context - -[handler_stdout] -class = StreamHandler -args = (sys.stdout,) -formatter = context - -[handler_watchedfile] -class = handlers.WatchedFileHandler -args = ('cinder.log',) -formatter = context - -[handler_tasks] -class = handlers.WatchedFileHandler -args = ('tasks.log',) -formatter = context - -[handler_syslog] -class = handlers.SysLogHandler -args = ('/dev/log', handlers.SysLogHandler.LOG_USER) -formatter = context - -[handler_null] -class = logging.NullHandler -formatter = default -args = () - -[formatter_context] -class = oslo_log.formatters.ContextFormatter - -[formatter_default] -format = %(message)s diff --git a/sys-cluster/cinder/files/etc.liberty/policy.json b/sys-cluster/cinder/files/etc.liberty/policy.json deleted file mode 100644 index 4c8a8aa5079c..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/policy.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "context_is_admin": "role:admin", - "admin_or_owner": "is_admin:True or project_id:%(project_id)s", - "default": "rule:admin_or_owner", - - "admin_api": "is_admin:True", - - "volume:create": "", - "volume:delete": "rule:admin_or_owner", - "volume:get": "rule:admin_or_owner", - "volume:get_all": "rule:admin_or_owner", - "volume:get_volume_metadata": "rule:admin_or_owner", - "volume:delete_volume_metadata": "rule:admin_or_owner", - "volume:update_volume_metadata": "rule:admin_or_owner", - "volume:get_volume_admin_metadata": "rule:admin_api", - "volume:update_volume_admin_metadata": "rule:admin_api", - "volume:get_snapshot": "rule:admin_or_owner", - "volume:get_all_snapshots": "rule:admin_or_owner", - "volume:delete_snapshot": "rule:admin_or_owner", - "volume:update_snapshot": "rule:admin_or_owner", - "volume:extend": "rule:admin_or_owner", - "volume:update_readonly_flag": "rule:admin_or_owner", - "volume:retype": "rule:admin_or_owner", - "volume:update": "rule:admin_or_owner", - - "volume_extension:types_manage": "rule:admin_api", - "volume_extension:types_extra_specs": "rule:admin_api", - "volume_extension:volume_type_access": "rule:admin_or_owner", - "volume_extension:volume_type_access:addProjectAccess": "rule:admin_api", - "volume_extension:volume_type_access:removeProjectAccess": "rule:admin_api", - "volume_extension:volume_type_encryption": "rule:admin_api", - "volume_extension:volume_encryption_metadata": "rule:admin_or_owner", - "volume_extension:extended_snapshot_attributes": "rule:admin_or_owner", - "volume_extension:volume_image_metadata": "rule:admin_or_owner", - - "volume_extension:quotas:show": "", - "volume_extension:quotas:update": "rule:admin_api", - "volume_extension:quota_classes": "rule:admin_api", - - "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", - "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", - "volume_extension:backup_admin_actions:reset_status": "rule:admin_api", - "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", - "volume_extension:volume_admin_actions:force_detach": "rule:admin_api", - "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api", - "volume_extension:backup_admin_actions:force_delete": "rule:admin_api", - "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api", - "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api", - - "volume_extension:volume_host_attribute": "rule:admin_api", - "volume_extension:volume_tenant_attribute": "rule:admin_or_owner", - "volume_extension:volume_mig_status_attribute": "rule:admin_api", - "volume_extension:hosts": "rule:admin_api", - "volume_extension:services:index": "rule:admin_api", - "volume_extension:services:update" : "rule:admin_api", - - "volume_extension:volume_manage": "rule:admin_api", - "volume_extension:volume_unmanage": "rule:admin_api", - - "volume_extension:capabilities": "rule:admin_api", - - "volume:create_transfer": "rule:admin_or_owner", - "volume:accept_transfer": "", - "volume:delete_transfer": "rule:admin_or_owner", - "volume:get_all_transfers": "rule:admin_or_owner", - - "volume_extension:replication:promote": "rule:admin_api", - "volume_extension:replication:reenable": "rule:admin_api", - - "volume:enable_replication": "rule:admin_api", - "volume:disable_replication": "rule:admin_api", - "volume:failover_replication": "rule:admin_api", - "volume:list_replication_targets": "rule:admin_api", - - "backup:create" : "", - "backup:delete": "rule:admin_or_owner", - "backup:get": "rule:admin_or_owner", - "backup:get_all": "rule:admin_or_owner", - "backup:restore": "rule:admin_or_owner", - "backup:backup-import": "rule:admin_api", - "backup:backup-export": "rule:admin_api", - - "snapshot_extension:snapshot_actions:update_snapshot_status": "", - "snapshot_extension:snapshot_manage": "rule:admin_api", - "snapshot_extension:snapshot_unmanage": "rule:admin_api", - - "consistencygroup:create" : "group:nobody", - "consistencygroup:delete": "group:nobody", - "consistencygroup:update": "group:nobody", - "consistencygroup:get": "group:nobody", - "consistencygroup:get_all": "group:nobody", - - "consistencygroup:create_cgsnapshot" : "group:nobody", - "consistencygroup:delete_cgsnapshot": "group:nobody", - "consistencygroup:get_cgsnapshot": "group:nobody", - "consistencygroup:get_all_cgsnapshots": "group:nobody", - - "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api" -} diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf b/sys-cluster/cinder/files/etc.liberty/rootwrap.conf deleted file mode 100644 index 4d280eae5c82..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for cinder-rootwrap -# This file should be owned by (and only-writeable by) the root user - -[DEFAULT] -# List of directories to load filter definitions from (separated by ','). -# These directories MUST all be only writeable by root ! -filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap - -# List of directories to search executables in, in case filters do not -# explicitely specify a full path (separated by ',') -# If not specified, defaults to system PATH environment variable. -# These directories MUST all be only writeable by root ! -exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin - -# Enable logging to syslog -# Default value is False -use_syslog=False - -# Which syslog facility to use. -# Valid values include auth, authpriv, syslog, local0, local1... -# Default value is 'syslog' -syslog_log_facility=syslog - -# Which messages to log. -# INFO means log all usage -# ERROR means only log unsuccessful attempts -syslog_log_level=ERROR diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters b/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters deleted file mode 100644 index 9e7ab384c4f7..000000000000 --- a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters +++ /dev/null @@ -1,207 +0,0 @@ -# cinder-rootwrap command filters for volume nodes -# This file should be owned by (and only-writeable by) the root user - -[Filters] -# cinder/volume/iscsi.py: iscsi_helper '--op' ... -ietadm: CommandFilter, ietadm, root -tgtadm: CommandFilter, tgtadm, root -iscsictl: CommandFilter, iscsictl, root -tgt-admin: CommandFilter, tgt-admin, root -cinder-rtstool: CommandFilter, cinder-rtstool, root -scstadmin: CommandFilter, scstadmin, root - -# LVM related show commands -pvs: EnvFilter, env, root, LC_ALL=C, pvs -vgs: EnvFilter, env, root, LC_ALL=C, vgs -lvs: EnvFilter, env, root, LC_ALL=C, lvs -lvdisplay: EnvFilter, env, root, LC_ALL=C, lvdisplay - -# LVM conf var -pvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, pvs -vgs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, vgs -lvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvs -lvdisplay_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvdisplay - -# os-brick library commands -# TODO(smcginnis) This is a temporary fix. Need to pull in os-brick -# os-brick.filters file instead and clean out stale brick values from -# this file. -scsi_id: CommandFilter, /lib/udev/scsi_id, root - -# cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname -pvresize: CommandFilter, pvresize, root - -# cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list -vgcreate: CommandFilter, vgcreate, root - -# cinder/volumes/drivers/srb.py: 'vgremove', '-f', vgname -vgremove: CommandFilter, vgremove, root - -# cinder/volumes/drivers/srb.py: 'vgchange', '-an', vgname -# cinder/volumes/drivers/srb.py: 'vgchange', '-ay', vgname -vgchange: CommandFilter, vgchange, root - -# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,.. -# cinder/volume/driver.py: 'lvcreate', '-L', ... -lvcreate: CommandFilter, lvcreate, root - -# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,... -dd: CommandFilter, dd, root - -# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ... -lvremove: CommandFilter, lvremove, root - -# cinder/volume/driver.py: 'lvrename', '%(vg)s', '%(orig)s' '(new)s'... -lvrename: CommandFilter, lvrename, root - -# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(lv_name)s' ... -# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(thin_pool)s' ... -lvextend: CommandFilter, lvextend, root - -# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>' -lvchange: CommandFilter, lvchange, root - -# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',... -# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ... -iscsiadm: CommandFilter, iscsiadm, root - -# cinder/volume/drivers/lvm.py: 'shred', '-n3' -# cinder/volume/drivers/lvm.py: 'shred', '-n0', '-z', '-s%dMiB' -shred: CommandFilter, shred, root - -# cinder/volume/utils.py: utils.temporary_chown(path, 0) -chown: CommandFilter, chown, root - -# cinder/volume/utils.py: copy_volume(..., ionice='...') -ionice_1: ChainingRegExpFilter, ionice, root, ionice, -c[0-3], -n[0-7] -ionice_2: ChainingRegExpFilter, ionice, root, ionice, -c[0-3] - -# cinder/volume/utils.py: setup_blkio_cgroup() -cgcreate: CommandFilter, cgcreate, root -cgset: CommandFilter, cgset, root -cgexec: ChainingRegExpFilter, cgexec, root, cgexec, -g, blkio:\S+ - -# cinder/volume/driver.py -dmsetup: CommandFilter, dmsetup, root -ln: CommandFilter, ln, root - -# cinder/image/image_utils.py -qemu-img: EnvFilter, env, root, LC_ALL=C, qemu-img -qemu-img_convert: CommandFilter, qemu-img, root - -udevadm: CommandFilter, udevadm, root - -# cinder/volume/driver.py: utils.read_file_as_root() -cat: CommandFilter, cat, root - -# cinder/volume/nfs.py -stat: CommandFilter, stat, root -mount: CommandFilter, mount, root -df: CommandFilter, df, root -du: CommandFilter, du, root -truncate: CommandFilter, truncate, root -chmod: CommandFilter, chmod, root -rm: CommandFilter, rm, root - -# cinder/volume/drivers/netapp/nfs.py: -netapp_nfs_find: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -name, img-cache.*, -amin, \+\d+ - -# cinder/volume/drivers/glusterfs.py -chgrp: CommandFilter, chgrp, root -umount: CommandFilter, umount, root -fallocate: CommandFilter, fallocate, root - -# cinder/volumes/drivers/hds/hds.py: -hus-cmd: CommandFilter, hus-cmd, root -hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root - -# cinder/volumes/drivers/hds/hnas_backend.py -ssc: CommandFilter, ssc, root - -# cinder/brick/initiator/connector.py: -ls: CommandFilter, ls, root -tee: CommandFilter, tee, root -multipath: CommandFilter, multipath, root -multipathd: CommandFilter, multipathd, root -systool: CommandFilter, systool, root - -# cinder/volume/drivers/block_device.py -blockdev: CommandFilter, blockdev, root - -# cinder/volume/drivers/ibm/gpfs.py -# cinder/volume/drivers/tintri.py -mv: CommandFilter, mv, root - -# cinder/volume/drivers/ibm/gpfs.py -cp: CommandFilter, cp, root -mmgetstate: CommandFilter, /usr/lpp/mmfs/bin/mmgetstate, root -mmclone: CommandFilter, /usr/lpp/mmfs/bin/mmclone, root -mmlsattr: CommandFilter, /usr/lpp/mmfs/bin/mmlsattr, root -mmchattr: CommandFilter, /usr/lpp/mmfs/bin/mmchattr, root -mmlsconfig: CommandFilter, /usr/lpp/mmfs/bin/mmlsconfig, root -mmlsfs: CommandFilter, /usr/lpp/mmfs/bin/mmlsfs, root -mmlspool: CommandFilter, /usr/lpp/mmfs/bin/mmlspool, root -mkfs: CommandFilter, mkfs, root -mmcrfileset: CommandFilter, /usr/lpp/mmfs/bin/mmcrfileset, root -mmlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmlinkfileset, root -mmunlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmunlinkfileset, root -mmdelfileset: CommandFilter, /usr/lpp/mmfs/bin/mmdelfileset, root -mmcrsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmcrsnapshot, root -mmdelsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmdelsnapshot, root - -# cinder/volume/drivers/ibm/gpfs.py -# cinder/volume/drivers/ibm/ibmnas.py -find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+ - -# cinder/brick/initiator/connector.py: -aoe-revalidate: CommandFilter, aoe-revalidate, root -aoe-discover: CommandFilter, aoe-discover, root -aoe-flush: CommandFilter, aoe-flush, root - -# cinder/brick/initiator/linuxscsi.py: -sg_scan: CommandFilter, sg_scan, root - -#cinder/backup/services/tsm.py -dsmc:CommandFilter,/usr/bin/dsmc,root - -# cinder/volume/drivers/hitachi/hbsd_horcm.py -raidqry: CommandFilter, raidqry, root -raidcom: CommandFilter, raidcom, root -pairsplit: CommandFilter, pairsplit, root -paircreate: CommandFilter, paircreate, root -pairdisplay: CommandFilter, pairdisplay, root -pairevtwait: CommandFilter, pairevtwait, root -horcmstart.sh: CommandFilter, horcmstart.sh, root -horcmshutdown.sh: CommandFilter, horcmshutdown.sh, root -horcmgr: EnvFilter, env, root, HORCMINST=, /etc/horcmgr - -# cinder/volume/drivers/hitachi/hbsd_snm2.py -auman: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auman -auluref: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluref -auhgdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgdef -aufibre1: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aufibre1 -auhgwwn: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgwwn -auhgmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgmap -autargetmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetmap -aureplicationvvol: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationvvol -auluadd: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluadd -auludel: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auludel -auluchgsize: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluchgsize -auchapuser: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auchapuser -autargetdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetdef -autargetopt: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetopt -autargetini: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetini -auiscsi: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auiscsi -audppool: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/audppool -aureplicationlocal: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationlocal -aureplicationmon: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationmon - -# cinder/volume/drivers/hgst.py -vgc-cluster: CommandFilter, vgc-cluster, root - -# cinder/volume/drivers/vzstorage.py -pstorage-mount: CommandFilter, pstorage-mount, root -pstorage: CommandFilter, pstorage, root - -# initiator/connector.py: -drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest index 34be18981287..e0ee03b942cb 100644 --- a/sys-cluster/heat/Manifest +++ b/sys-cluster/heat/Manifest @@ -1,13 +1,7 @@ -AUX heat.initd 1349 BLAKE2B ebd912b20b9e78a92b30fe42f0617b1aa1f5d4bbf24b0684d0d15214a5ac66aa0b6fe8980057def7a9702c60af026c0b021c753bc3e84ffce461a23c9f86abdb SHA512 a2a2f45bb4268260ca88d7cb5c2df1e9d27041bf36fa59aadc7e39d85b79aad6992c70a3e8f9d580a493801c75299ab99191df23624ad70139f30758d8027492 -AUX heat.initd-2 463 BLAKE2B e9a795bbe1e8b5059f0169d6b04bb087f20af75beb31583b1157bf76e4ea7f3e94d026b193aa6b4b39be3bf997519478a0678f628fe39a8ede87a5129d456ed2 SHA512 8f92853d6bb21e6efae3a59bc2856bd496498297e43a5aa0350a3202e8a709cfd0791f77017b77d8b7845c3cf0d2b266273026c9cac869e3dbc749e36bf83c7c -DIST heat-8.0.6.tar.gz 2312653 BLAKE2B fe48fc6df05be1f41b2b8e1a3f42291573627a812e2deda02cd8ad3ed9fd49c566a44dbb6565843a3371878e79a6052d887d4b6cb29fa423397dec15ef4d62c8 SHA512 221c29aed02feb02d2d28e9fc754e859962e385e20a6796e90659e3c6e661f08c3f243031b7257635329b0119ca8fc890ab827fed9adfd9bbdf1557649dd108f +AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734 -DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 -DIST heat.conf.sample-8.0.6 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 -EBUILD heat-2017.1.9999.ebuild 5666 BLAKE2B 6dfcb88efe1fa822bc40384fb77b51bcea587bc86ee03333ebb6840f5cbfe14fcdc82b1113f1cc43819f48191dc13a6ab94657c647a659c9dbdda990be6058d3 SHA512 7a279c78a9a087ed03871e0c4f3abd9a4e7cfd522348b6b0cf8bbe63cee5c815f5c68f0d652f89f76f8f343361295a3d032403c53a59ca67b729ea544862fee6 -EBUILD heat-2017.2.9999.ebuild 6456 BLAKE2B 9bd213139208ba745c067eec495e02640b54276d0477fb4c0e4e91f9a756536cfc9499b5c9993df3724fe921c2be3c77b9c2d0dd1ee9aad04aea1b29cbe79b93 SHA512 428dea0fd7a71b47dd271a5401270195542528c304d5c168cbea3b0ae4c130cad1c362069cf6a2df1e92c46e65fe6f542b115bf5f04f97e190f8c6cb1fe98e64 -EBUILD heat-8.0.6.ebuild 5644 BLAKE2B 7f1deb14634bf21425c6c4d0d76a468efcf1149b02c8c606a682dbd1e091944b43e64b461c6ae593fbd67b3b8406de0754f16b6bd3c5371ff353b5257e91fb87 SHA512 cb84411a7412296bce7ab2b8dfa47fe6737f2b1dfa674f10b9210369abacdcac39ed3341a32b261254b5d04e3a2de450574d7d381198cb6627a910969ca1c483 -EBUILD heat-9.0.2.ebuild 6374 BLAKE2B 97d2c64303f39252f8073f5b996af6da53a93c4a456fd3caab016bdc5f70ad5f845405302f41beb72ef2c5bb1b7433240cacbf05adc1c6b28f9f23876fef1eef SHA512 5b1d92c5a075bc5b4defbf1388d50c3a73145e3e3ddf37e96d11c4099f0c31cffbb9f7c2773de86c64fc1e4365a841f05e70d3f3613740b379d181bdd60e45fa +EBUILD heat-2017.2.9999.ebuild 6454 BLAKE2B 5ef108f6fbed87fcdf0ccabaf3f9d7101027a1d7e906eb07e58a6eb9828b3656c7f497c629b63e380e5fdc83659de8431508df1aa93aa70f10c16606191d6020 SHA512 12e7337c9eb4749b558513b3ccdccf1c9a248151ef14865d63830b2787c4565ba1ded26444f7132a020eda5dc23c1b791a2a7632fba6fe2a8a96efcbf49a0600 +EBUILD heat-9.0.2.ebuild 6372 BLAKE2B a0682068a8ffea4911523ecee326819392b0570df172b380f8102b96702fbbf744b12c7f31e24672460d65fad7a42602e724572750ca77fe856182ad943e97da SHA512 03d0284b311abb2eaebbfa92c86914bbede58ad34f3d8498cf2d3dc8fbdb0d9a531247dfdfded6b824f9c538c4d2fdb109a5515b46d59242b1bed812174393a5 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429 diff --git a/sys-cluster/heat/files/heat.initd b/sys-cluster/heat/files/heat.initd index 41ec14cf82a3..295879ebea79 100644 --- a/sys-cluster/heat/files/heat.initd +++ b/sys-cluster/heat/files/heat.initd @@ -1,52 +1,16 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -BASENAME=$(echo $SVCNAME | cut -d '-' -f 1) -SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2) +description="Starts ${SVCNAME} service for OpenStack" + +command=/usr/bin/${SVCNAME} +command_user="${HEAT_USER:-heat}" +command_background=yes +command_args="--config-file /etc/heat/heat.conf --log-file ${HEAT_LOGDIR:-/var/log/heat}/${SVCNAME}.log" +pidfile=/run/${SVCNAME}.pid +required_files=/etc/heat/heat.conf depend() { need net } - -checkconfig() { - if [ ! -r /etc/conf.d/$BASENAME ]; then - eerror "No heat conf.d file found: /etc/conf.d/$BASENAME)" - else - . /etc/conf.d/$BASENAME - fi -} - -start() { - checkconfig || return $? - - ebegin "Starting ${SVCNAME}" - if [ ! -d ${PID_PATH} ]; then - mkdir ${PID_PATH} - chown heat:root ${PID_PATH} - fi - - start-stop-daemon --start \ - --quiet \ - --user heat \ - --pidfile "${PID_PATH}/${SVCNAME}.pid" \ - --make-pidfile \ - --background \ - --exec /usr/bin/heat-${SERVERNAME} -- --config-file /etc/heat/heat.conf --log-file /var/log/heat/heat-${SERVERNAME} - - eend $? "Failed to start ${SVCNAME}" -} - -stop() { - checkconfig || return $? - - ebegin "Stopping ${SVCNAME}" - - start-stop-daemon --stop \ - --quiet \ - --user heat \ - --pidfile "${PID_PATH}/${SVCNAME}.pid" \ - --exec /usr/bin/heat-${SERVERNAME} -- --config-file /etc/heat/heat.conf - - eend $? "Failed to stop ${SVCNAME}" -} diff --git a/sys-cluster/heat/files/heat.initd-2 b/sys-cluster/heat/files/heat.initd-2 deleted file mode 100644 index 2161aa9918ee..000000000000 --- a/sys-cluster/heat/files/heat.initd-2 +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Starts ${SVCNAME} service for OpenStack" - -command=/usr/bin/${SVCNAME} -command_user="${HEAT_USER:-heat}" -command_background=yes -command_args="--config-file /etc/heat/heat.conf --log-file ${HEAT_LOGDIR:-/var/log/heat}/${SVCNAME}.log" -pidfile=/run/${SVCNAME}.pid -required_files=/etc/heat/heat.conf - -depend() { - need net -} diff --git a/sys-cluster/heat/heat-2017.1.9999.ebuild b/sys-cluster/heat/heat-2017.1.9999.ebuild deleted file mode 100644 index 848baeb909fd..000000000000 --- a/sys-cluster/heat/heat-2017.1.9999.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils git-r3 linux-info user - -DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine." -HOMEPAGE="https://launchpad.net/heat" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}" -EGIT_REPO_URI="https://github.com/openstack/heat.git" -EGIT_BRANCH="stable/ocata" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+mysql +memcached postgres sqlite" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] - >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}] - >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] - >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}] - >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]" - -PATCHES=( -) - -pkg_setup() { - enewgroup heat - enewuser heat -1 -1 /var/lib/heat heat -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - diropts -m0750 -o heat -g heat - keepdir /etc/heat - dodir /etc/heat/environment.d - dodir /etc/heat/templates - - for svc in api api-cfn engine; do - newinitd "${FILESDIR}/heat.initd" heat-${svc} - done - - insinto /etc/heat - insopts -m0640 -o heat -g heat - newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample" - doins "etc/heat/api-paste.ini" - doins "etc/heat/policy.json" - insinto /etc/heat/templates - doins "etc/heat/templates/"* - insinto /etc/heat/environment.d - doins "etc/heat/environment.d/default.yaml" - - dodir /var/log/heat - fowners heat:heat /var/log/heat -} diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild index 64992465d1a3..08a656c38a7a 100644 --- a/sys-cluster/heat/heat-2017.2.9999.ebuild +++ b/sys-cluster/heat/heat-2017.2.9999.ebuild @@ -145,7 +145,7 @@ python_install_all() { dodir /etc/heat/templates for svc in api api-cfn engine; do - newinitd "${FILESDIR}/heat.initd-2" heat-${svc} + newinitd "${FILESDIR}/heat.initd" heat-${svc} done insinto /etc/heat diff --git a/sys-cluster/heat/heat-8.0.6.ebuild b/sys-cluster/heat/heat-8.0.6.ebuild deleted file mode 100644 index 395c670c7440..000000000000 --- a/sys-cluster/heat/heat-8.0.6.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine." -HOMEPAGE="https://launchpad.net/heat" -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+mysql +memcached postgres sqlite" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] - >=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] - >=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] - >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}] - >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] - >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}] - >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]" - -PATCHES=( -) - -pkg_setup() { - enewgroup heat - enewuser heat -1 -1 /var/lib/heat heat -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - diropts -m0750 -o heat -g heat - keepdir /etc/heat - dodir /etc/heat/environment.d - dodir /etc/heat/templates - - for svc in api api-cfn engine; do - newinitd "${FILESDIR}/heat.initd" heat-${svc} - done - - insinto /etc/heat - insopts -m0640 -o heat -g heat - newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample" - doins "etc/heat/api-paste.ini" - doins "etc/heat/policy.json" - insinto /etc/heat/templates - doins "etc/heat/templates/"* - insinto /etc/heat/environment.d - doins "etc/heat/environment.d/default.yaml" - - dodir /var/log/heat - fowners heat:heat /var/log/heat -} diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild index 05e13dfb05dc..9de5bb7102cf 100644 --- a/sys-cluster/heat/heat-9.0.2.ebuild +++ b/sys-cluster/heat/heat-9.0.2.ebuild @@ -143,7 +143,7 @@ python_install_all() { dodir /etc/heat/templates for svc in api api-cfn engine; do - newinitd "${FILESDIR}/heat.initd-2" heat-${svc} + newinitd "${FILESDIR}/heat.initd" heat-${svc} done insinto /etc/heat diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest index 287055c3a7b0..40b2efe96979 100644 --- a/sys-cluster/minikube/Manifest +++ b/sys-cluster/minikube/Manifest @@ -1,3 +1,5 @@ DIST minikube-0.24.1.tar.gz 19029537 BLAKE2B 09e179297e3b1b4691d6e865be3e8a989b695fd46badbb488fbaaf33c4fabec8daafcdf7e0b28e140f4648e0109a98cc8744e932c69337102508c28dcbe30e05 SHA512 5f9bf0a7898ff2a074d35885a1ec55f7d23b45751ccf5532616c21eca1adee84fdedbd3971b673628d09a34659296a84fd78655b983411038a6b7e22ab608116 +DIST minikube-0.25.0.tar.gz 19657702 BLAKE2B 5b396f2720300e56096f62956d429ff33999b956f80857131b3c89e33f11917a461d11982531744acc31bf62b7f365ca6e909fd50336f1440acff1889e374815 SHA512 43cd2be9b48cf44ade46936157e2654a81a773a055aaa4239c232e42ee769d9e165b02c43d8dce6a09396c30e46ec811f08ed0fb9a2c81f13db76e13ab03ef54 EBUILD minikube-0.24.1.ebuild 1236 BLAKE2B 4616683a376b18613b3e5e43de0c2d2ce20c8d79de087f6f11e90358722b1ba7d5818e55f3987d2593c3fdbeec354121202877fba3c6a22073ad70a17d9065f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599 +EBUILD minikube-0.25.0.ebuild 1236 BLAKE2B c7d4fbebe40d363ac3ab81e9d78bf47aff0a9bf484e24303679354626db52022f97ac75b08173001747f0fc6e7b840616deec372ea5645c2aaa2075f5d0fe165 SHA512 64012439cbabe20ea2da24c83200bfb8b1f51b7bcde6a44d8b8b643f90155ca17884d48308ae47030370dfc8b98a845fae64a1701f2aca121afd2e1ed4f4a057 MISC metadata.xml 329 BLAKE2B bee02eda560e62d3acfec815f602b025d2954be0e51e9d03866de095999db40208a582d8e135bb7403d6dc474f07a08c2a742d083606d6e11ff405af5b627030 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857 diff --git a/sys-cluster/minikube/minikube-0.25.0.ebuild b/sys-cluster/minikube/minikube-0.25.0.ebuild new file mode 100644 index 000000000000..44e50547202d --- /dev/null +++ b/sys-cluster/minikube/minikube-0.25.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit python-any-r1 golang-build golang-vcs-snapshot + +EGO_PN="k8s.io/minikube" +ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Single Node Kubernetes Cluster" +HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="hardened" + +DEPEND="dev-go/go-bindata + ${PYTHON_DEPS}" +RDEPEND=">=sys-cluster/kubectl-1.9.0" + +RESTRICT="test" + +src_prepare() { + default + sed -i -e 's/ -s -w/ -w/' -e 's#$(GOPATH)/bin/go-bindata#go-bindata#' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' src/${EGO_PN}/Makefile || die + sed -i -e "s/get_rev(), get_version(), get_tree_state()/get_rev(), get_version(), 'gitTreeState=clean'/" src/${EGO_PN}/hack/get_k8s_version.py || die +} + +src_compile() { + export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" + LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN} +} + +src_install() { + pushd src/${EGO_PN} || die + dobin out/minikube + dodoc -r docs CHANGELOG.md README.md + popd || die +} diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 0745aabebb1d..2ac00f60d868 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -4,21 +4,13 @@ AUX neutron-linuxbridge-agent.confd 133 BLAKE2B 3df5685ee81f177d3c6ff052db67a3f7 AUX neutron-metadata-agent.confd 79 BLAKE2B 24cd05b5e8bc4dc8eb85401f95454e4cd0ee939fb89151e7d3dfc4dc6db5e917b699f9a6d518cd6a3528df0b9e88a826a03068a8150e67e33cc0cda50a215424 SHA512 a7a4af56141f1528f7f9ca222f88d400f7a5f6cba392a603121974f6429ecdb925996b1bd6631b589df70464f910deed688e287668ccb1d61fe1d6aa641272a1 AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037eed86bbaa741e3f891f84e22d43a365422a9b44cbd787c71f8faa66c98ce5279087c419f197d54919a98e47268f5b21aa9 SHA512 277bc5fe0a55bfc5e6f95ddabee76340a7725d156ca1100bc0dbc6245929322e537129628b5cef353cfe689d14330a7c8e0cd9aff894f7d0b093d909c83fdd87 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 -AUX neutron.initd 679 BLAKE2B 7b43bacee5ef324fff003c20c89119110fbab21fa168947176bd98b621a2cb11fffd96cee8c84027ba7b92d4f171c3325337cc290e6b38782d2973bf19becc47 SHA512 7c233d3ca96a90201a97772b67e98d50e7dcacc079bee9d7eb62e3900b54d515eb4615bea098148ec5bd02ecab0818dad80f2dcbd9867760b31cb74325218493 -AUX neutron.initd-2 530 BLAKE2B a5f6034f2d3119f8193dfa8e33f5e79a7af15602447a67ef103749edbf9b9f53d84c7c792c505ee9b233506a5d1eb5f4cbbc116ecb6a0471b650914c6d4d6731 SHA512 56331cbac87b14180e738cb2d3881682344a59f698b8fa67428e058693430363418e31707484786b4eb8053904c061d278d06a56c03cc77d8f6a0372c892d5a7 +AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 -DIST neutron-10.0.4.tar.gz 3124422 BLAKE2B 76dc1f5f6031cb98e4e03bfd91a3f2ee5512566306ff48f8bcd2f21d6d21b308418f746e8d01185adfb049f8d06f03e149d60595977052f92b593baf0e04dbaf SHA512 f85949ac08728b6338cf58abfaf2c9e67882d49fefa16104580c73aaea3f0634602712583e88248f261fd3b0c8690172e4a72f550bd159cacf732440274cc844 DIST neutron-11.0.2.tar.gz 10481255 BLAKE2B 3e2ca3e7e24f21d92823b3d2e44d3fabe17d40cac493797a960b7c20fd906f3bd8ca946ca0729f8e03079f6615e2094f9228a01c2fc1e79ab2cf63bd2a8a5b36 SHA512 ba86e6448d0ae6e95dd4caa41888ee3d4ceeb4353b655b20912871e05cc2440f7d54bef7b119e1cec98da8fe3b9f22966ca8ad05dc3a5931b66b776bef9240cf -DIST neutron-configs-10.0.4.tar.gz 25094 BLAKE2B 879b3178f6688d04b62843889ce97d8d99eed311d2401119ad9ca526ff8a3166decfbd94b523ce46587c0bcf146d7f433051d4c55719257ba6d88aacf6a71d46 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d DIST neutron-configs-11.0.2.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a -DIST neutron-configs-2017.1.9999.tar.gz 25094 BLAKE2B 879b3178f6688d04b62843889ce97d8d99eed311d2401119ad9ca526ff8a3166decfbd94b523ce46587c0bcf146d7f433051d4c55719257ba6d88aacf6a71d46 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a -DIST neutron-ml2-plugins-10.0.4.tar.gz 6811 BLAKE2B c6ee0b9f03d9af349da8bdbcc3b9b55b8ca72ec5fd8326ac91879b5f0523d8d0787e5b36ece88c6ed812c94d33eb853dd3c28958f8685a9dc8a51581bc7443e1 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb DIST neutron-ml2-plugins-11.0.2.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd -DIST neutron-ml2-plugins-2017.1.9999.tar.gz 6811 BLAKE2B c6ee0b9f03d9af349da8bdbcc3b9b55b8ca72ec5fd8326ac91879b5f0523d8d0787e5b36ece88c6ed812c94d33eb853dd3c28958f8685a9dc8a51581bc7443e1 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd -EBUILD neutron-10.0.4.ebuild 8645 BLAKE2B 4bcf66459d1f2075e066615002012e4bbeb7a3668d4f0b5797c389f990ea5766412030bbbbb1b389b8bb09d8bfcb131da4895115c08961b93e6e28b7eaf38602 SHA512 8069f0a69824c5dfcf127d0e058dd0c0e5cff5a5ae54b3bf82e87bfc55e283379f3e38a095edce156f6533ae2547b3f7a54c1fe09fd44c10d5c28847d73ad0bc -EBUILD neutron-11.0.2.ebuild 9547 BLAKE2B e7bb4da2f38fe76a3066cae6fed3d38d830ab4e24c2d78f1929cfea60ffe0ad9f258efb83078d1bf12370e1280b63f08de902008217d61e4b88423477b3afb0a SHA512 097ba6eb1aa4a3a3748978f32ccbfa496855eeb9ce34931061380d52210225687952713ceb5940e1a0d4a57213ff815209dc58b7ffba21ea986a6adc7c4c36f0 -EBUILD neutron-2017.1.9999.ebuild 8670 BLAKE2B 7458a267376b72c3e5848efdcf2db68b8eb1fa2d2ba216f6fcaf530d47ac4e1e2abdadc455e0d6e33cf1b2a7ae7c54e38a52d8bb234b553f7fe04d9ab15800f5 SHA512 26022752732fe8171b1e341d36f04b8eb73b3ad64b798a5002856d8d68672d88766ae0a19e66dd0af9122e3a12d0569e3b19b5646495fc45557ffa04d0ddf62f -EBUILD neutron-2017.2.9999.ebuild 9571 BLAKE2B 80a9240e5834e9f3faaef64a04d834d6c2a7c25072df225e1f35481bfd6e5046fc5ff992c90c075bd1a82e330ccd5520c38febf3320452a749df686a8231d877 SHA512 4769f3f31fc4e9b936a556272dc59614b8f50e3a077afa564472a65ee96baba352ab2dd641537331bdb30349c0114cdc1c0984a1cf809290950eab576dc7ef58 +EBUILD neutron-11.0.2.ebuild 9533 BLAKE2B 7257018a7ff36dfd7d1ccaa9489e757dc2ad87ebe7ddd4e6e0e36a56bfe6c500fb9c74348455cc059b598f67a277b7deaa1f071f8191e7165acb953ba74e8744 SHA512 61d6d8fe07dee7c85e9ef1eb4a995595b32ce3e02cbdce01561fd00bc61fc82f4569dbff477015cd6a707a581160dc6b398ea00d56a56f25b838b59ba6c66233 +EBUILD neutron-2017.2.9999.ebuild 9557 BLAKE2B d661784d90f54e8a64dc3fde940233f758bd66c2d9247895814e36d5a8c3b6391cf5eb811b50a1231d7a9391e3185edacaf41887240b193abc87bdc72a6732c4 SHA512 698885b55869db76df6b52ccbb0aa40816175de05aef6019b264fb5fbdf2a0212d6d7f585e8deeafee6a5092f954b2b40136e78fe80a41bc9074835998c28f19 MISC metadata.xml 1563 BLAKE2B 30b54bb37018ba827af3326e5704c9506ae175e01ac1588bd090384e642f41b9ee7662f33697007a1594772de0eeb64fe5e2afe3953e0b9da98bdbbab6a4905e SHA512 137f360c6ad2e71ff87105a260b4fdca88264ad0bcd0be3b4f8f5f111002f1d5c47d1423f443f24fa3d11b6f3f0fa7891999ddea3b74c33a29c9cfdcc8316ac6 diff --git a/sys-cluster/neutron/files/neutron.initd b/sys-cluster/neutron/files/neutron.initd index 803ccb58f70e..26bf768ddff3 100644 --- a/sys-cluster/neutron/files/neutron.initd +++ b/sys-cluster/neutron/files/neutron.initd @@ -1,20 +1,17 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="Starts ${SVCNAME} service for OpenStack" command=/usr/bin/"${SVCNAME}" command_background=yes -pidfile=/var/run/neutron/"${SVCNAME}".pid +command_user="${NEUTRON_USER:-neutron}" +pidfile=/run/"${SVCNAME}".pid required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) -command_args="${required_files[@]/#/--config-file } --log-file /var/log/neutron/${SVCNAME#*-}.log" -start_stop_daemon_args="--quiet --user ${NEUTRON_USER:-neutron}" +command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" +retry="SIGTERM/15" depend() { need net } - -start_pre() { - checkpath --directory --owner "${NEUTRON_USER:-neutron}":"${NEUTRON_GROUP:-neutron}" --mode 0755 "${NEUTRON_RUN:-/var/run/neutron}" -} diff --git a/sys-cluster/neutron/files/neutron.initd-2 b/sys-cluster/neutron/files/neutron.initd-2 deleted file mode 100644 index 7a7dad6e6865..000000000000 --- a/sys-cluster/neutron/files/neutron.initd-2 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Starts ${SVCNAME} service for OpenStack" - -command=/usr/bin/"${SVCNAME}" -command_background=yes -command_user="${NEUTRON_USER:-neutron}" -pidfile=/run/"${SVCNAME}".pid -required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) -command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" -retry="SIGTERM/15" - -depend() { - need net -} diff --git a/sys-cluster/neutron/neutron-10.0.4.ebuild b/sys-cluster/neutron/neutron-10.0.4.ebuild deleted file mode 100644 index 482826b624b0..000000000000 --- a/sys-cluster/neutron/neutron-10.0.4.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 - -inherit distutils-r1 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" -REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server - || ( openvswitch linuxbridge ) )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.2[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.3[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.4[${PYTHON_USEDEP}] - !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] - >=dev-python/ryu-4.9[${PYTHON_USEDEP}] - compute-only? ( - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/ovs-2.6.1[${PYTHON_USEDEP}] - >=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}] - >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-misc/iputils[arping] - net-misc/bridge-utils - net-firewall/ipset - net-firewall/iptables - net-firewall/ebtables - net-firewall/conntrack-tools - openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) - ipv6? ( - net-misc/radvd - >=net-misc/dibbler-1.0.1 - ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi -} - -pkg_setup() { - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - sed -i '/^hacking/d' test-requirements.txt || die - # it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - # add generated configs - cd "${D}/etc/neutron" || die - unpack "neutron-configs-${PV}.tar.gz" - cd "${D}/etc/neutron/plugins/ml2" || die - unpack "neutron-ml2-plugins-${PV}.tar.gz" - - # correcting perms - fowners neutron:neutron -R "/etc/neutron" - fperms o-rwx -R "/etc/neutron/" - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install() { - distutils-r1_python_install - # copy migration conf file (not coppied on install via setup.py script) - insopts -m 0644 - insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" -} - -pkg_postinst() { - elog - elog "neutron-server's conf.d file may need updating to include additional ini files" - elog "We currently assume the ml2 plugin will be used but do not make assumptions" - elog "on if you will use openvswitch or linuxbridge (or something else)" - elog - elog "Other conf.d files may need updating too, but should be good for the default use case" - elog -} diff --git a/sys-cluster/neutron/neutron-11.0.2.ebuild b/sys-cluster/neutron/neutron-11.0.2.ebuild index 575c14d4433d..cb3c6335654c 100644 --- a/sys-cluster/neutron/neutron-11.0.2.ebuild +++ b/sys-cluster/neutron/neutron-11.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -177,30 +177,30 @@ src_prepare() { python_install_all() { distutils-r1_python_install_all if use server; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-server" + newinitd "${FILESDIR}/neutron.initd" "neutron-server" newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini fi if use dhcp; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" fi if use l3; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" fi if use metadata; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" fi if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-openvswitch-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup" + newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" fi if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-linuxbridge-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" fi diropts -m 755 -o neutron -g neutron diff --git a/sys-cluster/neutron/neutron-2017.1.9999.ebuild b/sys-cluster/neutron/neutron-2017.1.9999.ebuild deleted file mode 100644 index 1872be64f638..000000000000 --- a/sys-cluster/neutron/neutron-2017.1.9999.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 - -inherit distutils-r1 git-r3 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz" -EGIT_REPO_URI="https://github.com/openstack/neutron.git" -EGIT_BRANCH="stable/ocata" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" -REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server - || ( openvswitch linuxbridge ) )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.2[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.3[${PYTHON_USEDEP}] - !~dev-python/pecan-1.0.4[${PYTHON_USEDEP}] - !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] - >=dev-python/ryu-4.9[${PYTHON_USEDEP}] - compute-only? ( - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/ovs-2.6.1[${PYTHON_USEDEP}] - >=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}] - >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] - >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-misc/iputils[arping] - net-misc/bridge-utils - net-firewall/ipset - net-firewall/iptables - net-firewall/ebtables - net-firewall/conntrack-tools - openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) - ipv6? ( - net-misc/radvd - >=net-misc/dibbler-1.0.1 - ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi -} - -pkg_setup() { - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - sed -i '/^hacking/d' test-requirements.txt || die - # it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - # add generated configs - cd "${D}/etc/neutron" || die - unpack "neutron-configs-${PV}.tar.gz" - cd "${D}/etc/neutron/plugins/ml2" || die - unpack "neutron-ml2-plugins-${PV}.tar.gz" - - # correcting perms - fowners neutron:neutron -R "/etc/neutron" - fperms o-rwx -R "/etc/neutron/" - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install() { - distutils-r1_python_install - # copy migration conf file (not coppied on install via setup.py script) - insopts -m 0644 - insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" -} - -pkg_postinst() { - elog - elog "neutron-server's conf.d file may need updating to include additional ini files" - elog "We currently assume the ml2 plugin will be used but do not make assumptions" - elog "on if you will use openvswitch or linuxbridge (or something else)" - elog - elog "Other conf.d files may need updating too, but should be good for the default use case" - elog -} diff --git a/sys-cluster/neutron/neutron-2017.2.9999.ebuild b/sys-cluster/neutron/neutron-2017.2.9999.ebuild index d0129f9df24d..61871bc47a58 100644 --- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild +++ b/sys-cluster/neutron/neutron-2017.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -178,30 +178,30 @@ src_prepare() { python_install_all() { distutils-r1_python_install_all if use server; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-server" + newinitd "${FILESDIR}/neutron.initd" "neutron-server" newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini fi if use dhcp; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" fi if use l3; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" fi if use metadata; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" fi if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-openvswitch-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup" + newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" fi if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd-2" "neutron-linuxbridge-agent" + newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" fi diropts -m 755 -o neutron -g neutron diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest index df22fff88e55..f51ed04a7e82 100644 --- a/sys-cluster/nova/Manifest +++ b/sys-cluster/nova/Manifest @@ -1,17 +1,11 @@ AUX nova-compute.conf 144 BLAKE2B d7e7d6fc972243b49e82a70ee9798a9f44cf78709105b785073cfcf3de71d1e94de6574af6529363c1f5ff8f2029dcea2cb71aeab52964b73674cfc9d498accc SHA512 88d7207f4d7008e909c276f153e2abd66c2fb34fad85c90fe0bcc65a10f9c9c619ac315aee25e486e85896a2dfdc97eda4c9d2c78bd8b4117eaac7d8ebfb0270 AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e960cd2c086df1def3a87ccd6ebd0719a16fc66a084e018e8b5b9e7b95be6f90abad6600509756 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 -AUX nova.initd 944 BLAKE2B aa535734ce9df39c6c6fc254a30fa4fdc2858b846a252359e6d9c6f51e6a910dea55f424698ca6d5388557dc66c35c96374d008ccbdd9cf88492eb16bb563f63 SHA512 c71b3af496c3128ed4eef9c459a8a488209a2bd28a7e0439b92505087eacbdcb8546e9bc4a29fd9041d6626b0552ec33856611ce2bccf90b5a4102a657750b32 -AUX nova.initd-2 745 BLAKE2B 8d2fb59480dd0c60bb2e46541d5c59d7497bda714377428a95e34178c77958dc3b5363e928f63167ad3263ecd2628dca95742b5b88537f3b0a981c35089b1c4b SHA512 859c2a55c7a91da4a83a8aad5396c4b692e91c170c70b7705620f90da461b78a9cae6ff1c734bee3b20d245f502c475847e0ec1525cca167693303f326e6e42c +AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086afcd9159264d7c357731aa565f857257ae5591599704f7524a8005e531dcd6d848cd197ef79d SHA512 42b029745341b7516f3f158d214053123d894c1e3f7d354d7a83009630ce371a297b10b59bb4a655cd43e226ed8c045b4fbf4d9b20b73dd490e2181dabc70077 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409 -DIST nova-15.1.0.tar.gz 5774942 BLAKE2B 6507658dabf1cc9da34c40bf3c5fb77c9e5692ceeea6fe4b38cca8be3cf532db6bbdd14dd71c78e1545791eaf26f60bd9337fca4561d811d1116a32458a86c6d SHA512 a35cc1a1891f0440470cb31cd23f835190d5961a962afc308f54ffe1bb0e47eb0e411915b47e8b89e7f76a2b3c348997848d86fd10123a375c7fbb8c118f66b0 DIST nova-16.0.4.tar.gz 10922054 BLAKE2B 1fb76f0a06149cb67543921cc9f49cd869ebcb85a813079cdde7ed38aded81d0ec5f157b7d031a9269c3df66081cac1d0732286356dc9f8af58de02ba688a9c9 SHA512 8841faca0d3864a7f63f4c6eec637e6676df2b1473dacd0265a34ce4cf8e50bc587892de2f3d54d1e7a499adb8e9c06aca6d7956d010ddabae1ea61c7c5b0581 -DIST nova.conf.sample-15.1.0 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d DIST nova.conf.sample-16.0.4 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 -DIST nova.conf.sample-2017.1.9999 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 -EBUILD nova-15.1.0.ebuild 8591 BLAKE2B d793f00f7a6304b0dda01f0916d2e150fda36248f85d57fbbff8091a258bc9edd3ce6ebda1e9e4ba81f7ed9b3dd14b314e81bfb7385b03a20eabaa145e722cec SHA512 b5af3e2303327b7500ac67b9d4f5c479d2a4034f95124baf0b24e81df0bf336f0e1022baeabeac89adc53c12b06a4e4b778ff0fb81b846326675706cb7996683 -EBUILD nova-16.0.4.ebuild 9551 BLAKE2B 9146aeb92c4bf9ca2dc5f934b89991baba322aeda126172e545fcf38a87d053c7730c699da55f78c60a45b46778e979ee877318db0ced3c3b27c153b5e9211a3 SHA512 4cad08472658e3e127761fd7c7db9e027b63106b1b6b2c4ad9df6fd18d9b9b7eae90ca6c27dabd5b011e864c18ed9b0cbe26de9e6aa37af07723be1a0afc92aa -EBUILD nova-2017.1.9999.ebuild 8563 BLAKE2B fa3fd63355ae149de162b0a2322ebdc9bb8ced6cc62180055308d37b90310b46c8cfbba02e7716f1095f3e8cc864f8cb82311665fdb9c0d5c96a7ffdd976db0a SHA512 cea6cfbaafb3c5c0977cabbbc790da256daf851459079aa73c9d4ee0a9e81153051b2bd0cf62c18eeaee4be1c268a9cf35f671b839cc6a97316a8df80679f94a -EBUILD nova-2017.2.9999.ebuild 9572 BLAKE2B e09e3d7a3d68fcea4b6dd54df53761b8a65a106f9cd8135fec4386a510db12219d296abfe5a9d6b6d52188daf6e73cd450259e1d045604cfd1229264d7de3a5c SHA512 51f966525ad1f5d7b5b611296bbccd2bf81ec58b7a2021e48cee28342f451c19a95158b21aaa4c4f1a03c5e7d7f104e997389905737d4108fb3c666e0566a86d +EBUILD nova-16.0.4.ebuild 9545 BLAKE2B dea213885cc593f5744c12c7156b2db5a30e93bf068c783a93d8eb53c35d4ef0eaaeaee9f4271b0f1fd9b96ba0e2f33e4f7976459cc9d73dcf1fbed0fa30c206 SHA512 b7e8a4991a46b86a25d62a77609ef300f0b2107f43867c1876f50c446e4f5ff420c8bcef9958dbb20dd9f398a269277f602b37c69af555c48af2fc7cba1c2e2e +EBUILD nova-2017.2.9999.ebuild 9566 BLAKE2B 8874d34fced2011d197ce189095f43e1bc6080068d88087cb2d0b285c0ed48d0af56a2c80a906f4ce9323104943740276bd03b70f930b663c62246c38cb79d50 SHA512 5139a6196b404b02d0ccbcfb2f0a46e83985f4e6aebf3be57db830a797d79774a98984d739bce99e8fd3f08a95982b65d3ac0a800e8bee785c310c570e6fa29c MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4 diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd index 7d679ed95fc9..ba722949182e 100644 --- a/sys-cluster/nova/files/nova.initd +++ b/sys-cluster/nova/files/nova.initd @@ -1,30 +1,25 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="Starts ${SVCNAME} service for OpenStack" -command="/usr/bin/${SVCNAME} -- --config-file /etc/nova/nova.conf" -pidfile=/var/run/nova/${SVCNAME}.pid +command="/usr/bin/${SVCNAME}" +command_args="--config-file /etc/nova/nova.conf" +pidfile=/run/${SVCNAME}.pid +command_background=true required_files=/etc/nova/nova.conf -start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" if [ "$SVCNAME" == nova-compute ]; then required_files="${required_files} /etc/nova/nova-compute.conf" - command="${command} --config-file /etc/nova/nova-compute.conf" + command_args="${command_args} --config-file /etc/nova/nova-compute.conf" fi - +start_stop_daemon_args="-u ${NOVA_USER:-nova}" +retry="SIGTERM/15" depend() { use net } start_pre() { - checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova} checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} } - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon -S -b -m -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command} - eend $? -} diff --git a/sys-cluster/nova/files/nova.initd-2 b/sys-cluster/nova/files/nova.initd-2 deleted file mode 100644 index cb82c947ddfe..000000000000 --- a/sys-cluster/nova/files/nova.initd-2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Starts ${SVCNAME} service for OpenStack" - -command="/usr/bin/${SVCNAME}" -command_args="--config-file /etc/nova/nova.conf" -pidfile=/run/${SVCNAME}.pid -command_background=true -required_files=/etc/nova/nova.conf -if [ "$SVCNAME" == nova-compute ]; then - required_files="${required_files} /etc/nova/nova-compute.conf" - command_args="${command_args} --config-file /etc/nova/nova-compute.conf" -fi -start_stop_daemon_args="-u ${NOVA_USER:-nova}" -retry="SIGTERM/15" - -depend() { - use net -} - -start_pre() { - checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} -} diff --git a/sys-cluster/nova/nova-15.1.0.ebuild b/sys-cluster/nova/nova-15.1.0.ebuild deleted file mode 100644 index 51f6f6060bf6..000000000000 --- a/sys-cluster/nova/nova-15.1.0.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils linux-info multilib user - -DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python" -HOMEPAGE="https://launchpad.net/nova" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite" -REQUIRED_USE=" - !compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" - -CDEPEND=" - >=dev-python/setuptools-16.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}] - !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}] - >=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - compute-only? ( - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - <dev-python/prettytable-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] - >=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}] - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}] - >=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}] - dev-python/libvirt-python[${PYTHON_USEDEP}] - app-emulation/libvirt[iscsi?] - novncproxy? ( www-apps/novnc ) - sys-apps/iproute2 - openvswitch? ( net-misc/openvswitch ) - rabbitmq? ( net-misc/rabbitmq-server ) - memcached? ( - net-misc/memcached - >=dev-python/python-memcached-1.58 - ) - sys-fs/sysfsutils - sys-fs/multipath-tools - net-misc/bridge-utils - compute? ( - app-cdr/cdrtools - sys-fs/dosfstools - app-emulation/qemu - ) - iscsi? ( - sys-fs/lsscsi - >=sys-block/open-iscsi-2.0.873-r1 - )" - -#PATCHES=( -#) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ - NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ - ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi - enewgroup nova - enewuser nova -1 -1 /var/lib/nova nova -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -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 - newinitd "${FILESDIR}/nova.initd" "nova-${svc}" - done - fi - use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" - - diropts -m 0750 -o nova -g qemu - dodir /var/log/nova /var/lib/nova/instances - diropts -m 0750 -o nova -g nova - - insinto /etc/nova - insopts -m 0640 -o nova -g nova - newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" - doins "${FILESDIR}/nova-compute.conf" - doins "${S}/etc/nova/"* - # 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" - - # add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0600 -o root -g root - doins "${FILESDIR}/nova-sudoers" - - if use iscsi ; then - # Install udev rules for handle iscsi disk with right links under /dev - udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules - - insinto /etc/nova/ - doins "${FILESDIR}/scsi-openscsi-link.sh" - 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" - fi -} diff --git a/sys-cluster/nova/nova-16.0.4.ebuild b/sys-cluster/nova/nova-16.0.4.ebuild index 7fe984e7df04..8856721e03fb 100644 --- a/sys-cluster/nova/nova-16.0.4.ebuild +++ b/sys-cluster/nova/nova-16.0.4.ebuild @@ -199,11 +199,11 @@ python_install_all() { if use !compute-only; then for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do - newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}" + newinitd "${FILESDIR}/nova.initd" "nova-${svc}" done fi - use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy" + use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" + use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" diropts -m 0750 -o nova -g qemu dodir /var/log/nova /var/lib/nova/instances diff --git a/sys-cluster/nova/nova-2017.1.9999.ebuild b/sys-cluster/nova/nova-2017.1.9999.ebuild deleted file mode 100644 index fa38dc987200..000000000000 --- a/sys-cluster/nova/nova-2017.1.9999.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils git-r3 linux-info multilib user - -DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python" -HOMEPAGE="https://launchpad.net/nova" -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}" -EGIT_REPO_URI="https://github.com/openstack/nova.git" -EGIT_BRANCH="stable/ocata" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite" -REQUIRED_USE=" - !compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" - -CDEPEND=" - >=dev-python/setuptools-16.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}] - !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}] - >=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - compute-only? ( - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] - !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - <dev-python/prettytable-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] - !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] - >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] - >=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}] - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] - >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}] - >=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}] - dev-python/libvirt-python[${PYTHON_USEDEP}] - app-emulation/libvirt[iscsi?] - novncproxy? ( www-apps/novnc ) - sys-apps/iproute2 - openvswitch? ( net-misc/openvswitch ) - rabbitmq? ( net-misc/rabbitmq-server ) - memcached? ( - net-misc/memcached - >=dev-python/python-memcached-1.58 - ) - sys-fs/sysfsutils - sys-fs/multipath-tools - net-misc/bridge-utils - compute? ( - app-cdr/cdrtools - sys-fs/dosfstools - app-emulation/qemu - ) - iscsi? ( - sys-fs/lsscsi - >=sys-block/open-iscsi-2.0.873-r1 - )" - -#PATCHES=( -#) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ - NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ - ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi - enewgroup nova - enewuser nova -1 -1 /var/lib/nova nova -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -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 - newinitd "${FILESDIR}/nova.initd" "nova-${svc}" - done - fi - use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" - - diropts -m 0750 -o nova -g qemu - dodir /var/log/nova /var/lib/nova/instances - diropts -m 0750 -o nova -g nova - - insinto /etc/nova - insopts -m 0640 -o nova -g nova - newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" - doins "${FILESDIR}/nova-compute.conf" - doins "${S}/etc/nova/"* - # 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" - - # add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0600 -o root -g root - doins "${FILESDIR}/nova-sudoers" - - if use iscsi ; then - # Install udev rules for handle iscsi disk with right links under /dev - udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules - - insinto /etc/nova/ - doins "${FILESDIR}/scsi-openscsi-link.sh" - 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" - fi -} diff --git a/sys-cluster/nova/nova-2017.2.9999.ebuild b/sys-cluster/nova/nova-2017.2.9999.ebuild index 4bc17bcde842..b3bfe7036dfd 100644 --- a/sys-cluster/nova/nova-2017.2.9999.ebuild +++ b/sys-cluster/nova/nova-2017.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -200,11 +200,11 @@ python_install_all() { if use !compute-only; then for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do - newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}" + newinitd "${FILESDIR}/nova.initd" "nova-${svc}" done fi - use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute" - use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy" + use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" + use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" diropts -m 0750 -o nova -g qemu dodir /var/log/nova /var/lib/nova/instances diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest index 9b4c83fad097..835f0fa2f7ef 100644 --- a/sys-cluster/openstack-meta/Manifest +++ b/sys-cluster/openstack-meta/Manifest @@ -1,4 +1,2 @@ -EBUILD openstack-meta-2016.2.9999.ebuild 615 BLAKE2B 1a505d4fde7285bbd3683590dbab8b6975fac40ec6f99193b48147da21cdd24737f327ce556712d339f84522be6b8e191a04105cc1aa37931431c1b2ed4592ca SHA512 3ecb4da9176487240fc53d853cda6e8257fc2fe761508b0e3ebb0148ed47cbc93ce967e4f6a30036113d4997537a0f146160b34d5be5922d1d6be2f2e35ce5d1 -EBUILD openstack-meta-2017.1.9999.ebuild 616 BLAKE2B d34653e8af995e4f5416f1063d4ba1f780f732fc755c8fb92be4e3752e6f6fd7ff4043adfe243d2fd77d762308c2d3818de06020d5770dee96c78a38d03a2ba4 SHA512 c81135f7019bb9dafbb5da967a559848cac7445728beb76749dbac3881ae5945e8518cf21b3528daf2f8010887e3cccd22d1148797d054f24b9a62278d6e82c3 EBUILD openstack-meta-2017.2.9999.ebuild 616 BLAKE2B d34653e8af995e4f5416f1063d4ba1f780f732fc755c8fb92be4e3752e6f6fd7ff4043adfe243d2fd77d762308c2d3818de06020d5770dee96c78a38d03a2ba4 SHA512 c81135f7019bb9dafbb5da967a559848cac7445728beb76749dbac3881ae5945e8518cf21b3528daf2f8010887e3cccd22d1148797d054f24b9a62278d6e82c3 MISC metadata.xml 868 BLAKE2B d769c2b15440a48958819d31501f01020d65e667105bef5299bfc13d06d6f2ea19d2f461063e733ba9bff4426f803ef13062d1820f267437a458c972d363747f SHA512 20cad66e79a57fbe4e17bd8bd53a30b71746f5efa8ddaa9c6c7bebfa8db5fd64275dc213f927c433f1e6621d1b5d053efaef38c1144806cf736c44b56c5d967c diff --git a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild deleted file mode 100644 index 0d8f1662a682..000000000000 --- a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A openstack meta-package for installing the various openstack pieces" -HOMEPAGE="https://openstack.org" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="cinder glance heat keystone neutron nova swift" - -DEPEND="" -RDEPEND=" - keystone? ( ~sys-auth/keystone-${PV} ) - swift? ( <sys-cluster/swift-2.11 ) - neutron? ( ~sys-cluster/neutron-${PV} ) - glance? ( ~app-admin/glance-${PV} ) - cinder? ( ~sys-cluster/cinder-${PV} ) - nova? ( ~sys-cluster/nova-${PV} ) - heat? ( ~sys-cluster/heat-${PV} ) -" diff --git a/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild deleted file mode 100644 index 59b9ec4d4271..000000000000 --- a/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A openstack meta-package for installing the various openstack pieces" -HOMEPAGE="https://openstack.org" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="cinder glance heat keystone neutron nova swift" - -DEPEND="" -RDEPEND=" - keystone? ( ~sys-auth/keystone-${PV} ) - swift? ( ~sys-cluster/swift-${PV} ) - neutron? ( ~sys-cluster/neutron-${PV} ) - glance? ( ~app-admin/glance-${PV} ) - cinder? ( ~sys-cluster/cinder-${PV} ) - nova? ( ~sys-cluster/nova-${PV} ) - heat? ( ~sys-cluster/heat-${PV} ) -" diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest index 11cbaa2af93c..c0c1e9da07f3 100644 --- a/sys-cluster/swift/Manifest +++ b/sys-cluster/swift/Manifest @@ -2,12 +2,9 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec -DIST swift-2.13.1.tar.gz 1940686 BLAKE2B dde70b01c720acb4186f145fd6c80ae37a43f575e688e0875d66d5c1452547b4e16641183876e205ed659c75e3dd1bc3db834a4c6cb7e22424a35ee64ff3070c SHA512 6f08239bbeebfd213d2d7bb23c83507bf033288bb5125f5fd7f37517d8b3ad0b050220c1ad03632c1ab4723a98a9068b146e38c360e6786159a6f8638f4d5d79 DIST swift-2.15.1.tar.gz 2429235 BLAKE2B 4fd998e4f1f1eaab9eeb8f15bb9d159351feec3bc059d0174a6b3125267fcf77d976f8ae7b40d1944ccd4d2f62310ed59f3fbf110b436fac23e1ae7925c8bb5e SHA512 8b01831c6c9103953a3dd61fbaf0b18287af0ee3a2e4be376352266e8442bea54bcd32e7e6de89376feb5e492c5b49f623b8eda5e5ea3e58fe0dcea1547bc1ac DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696 -EBUILD swift-2.13.1-r1.ebuild 3698 BLAKE2B 8a94b57c4c58456438491f9a7e1ba5891c932201ada2ffe5d4c34582c6cb1e42456eca206bb875547ed5c6725234c3c7ce5148efa52a422e3f2ef9660fcda11c SHA512 fafcb23cdce1866d55f8ba8af42896da5b9cd47b667066da9da967ddd8f82388d49af28e29e2d78306bfa77bd1c67364ece90fb4f605e8df491b7dc8d55a9ef6 EBUILD swift-2.15.1-r1.ebuild 3698 BLAKE2B 8a94b57c4c58456438491f9a7e1ba5891c932201ada2ffe5d4c34582c6cb1e42456eca206bb875547ed5c6725234c3c7ce5148efa52a422e3f2ef9660fcda11c SHA512 fafcb23cdce1866d55f8ba8af42896da5b9cd47b667066da9da967ddd8f82388d49af28e29e2d78306bfa77bd1c67364ece90fb4f605e8df491b7dc8d55a9ef6 EBUILD swift-2.16.0.ebuild 3698 BLAKE2B 971a44109dc7fbc2230be6db33db966eb1596969953bb1ce03d9133683223f9c17553602397d5555dc88515e6dc5c283f829903ffbfcef1cd63c2cf855c9d8ef SHA512 5fa5c18cd19412aae6e41a544058b29cde20c3a9d84c89c27767ec7f8bff4021a559562e44bbd11b722fd6950b3529734ec42ab9a8bee930e6200160b873953e -EBUILD swift-2017.1.9999.ebuild 3712 BLAKE2B 0a6d0c0e813331859b2d301eb49d440564410ef0126d4f212f8355f97f8148bdb7adc03fdc88fc80e3a62df64f88a420a2b2ce359188e2509c6e9ba0b2661fe1 SHA512 9ebee6f9ada811dbb326c907865508bb5759ba0da0548b1b246cf79c8489c1b4f04646bed5d655a12544c8e9073d73f4589fd7ce635829fe4e2623e563767178 EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c diff --git a/sys-cluster/swift/swift-2.13.1-r1.ebuild b/sys-cluster/swift/swift-2.13.1-r1.ebuild deleted file mode 100644 index 20394c0afbb4..000000000000 --- a/sys-cluster/swift/swift-2.13.1-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" -HOMEPAGE="https://launchpad.net/swift" -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="proxy account container object +memcached" -REQUIRED_USE="|| ( proxy account container object )" - -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - -RDEPEND=" - ${CDEPEND} - >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - memcached? ( net-misc/memcached ) - net-misc/rsync[xattr]" - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR - ~ZFS" - if linux_config_exists; then - for module in ${CONFIG_CHECK}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewuser swift - enewgroup swift -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -src_test () { - # https://bugs.launchpad.net/swift/+bug/1249727 - find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die - SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/swift - insinto /etc/swift - - newins "etc/swift.conf-sample" "swift.conf" - newins "etc/rsyncd.conf-sample" "rsyncd.conf" - newins "etc/mime.types-sample" "mime.types-sample" - newins "etc/memcache.conf-sample" "memcache.conf-sample" - newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" - newins "etc/dispersion.conf-sample" "dispersion.conf-sample" - - if use proxy; then - newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" - newins "etc/proxy-server.conf-sample" "proxy-server.conf" - if use memcached; then - sed -i '/depend/a\ - need memcached' "${D}/etc/init.d/swift-proxy" - fi - fi - if use account; then - newinitd "${FILESDIR}/swift-account.initd" "swift-account" - newins "etc/account-server.conf-sample" "account-server.conf" - fi - if use container; then - newinitd "${FILESDIR}/swift-container.initd" "swift-container" - newins "etc/container-server.conf-sample" "container-server.conf" - fi - if use object; then - newinitd "${FILESDIR}/swift-object.initd" "swift-object" - newins "etc/object-server.conf-sample" "object-server.conf" - newins "etc/object-expirer.conf-sample" "object-expirer.conf" - fi - - fowners root:swift "/etc/swift" || die "fowners failed" - fperms 0750 /etc/swift -} - -pkg_postinst() { - elog "Openstack swift will default to using insecure http unless a" - elog "certificate is created in /etc/swift/cert.crt and the associated key" - elog "in /etc/swift/cert.key. These can be created with the following:" - elog " * cd /etc/swift" - elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" -} diff --git a/sys-cluster/swift/swift-2017.1.9999.ebuild b/sys-cluster/swift/swift-2017.1.9999.ebuild deleted file mode 100644 index 088cba57d7fe..000000000000 --- a/sys-cluster/swift/swift-2017.1.9999.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils git-r3 linux-info user - -DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" -HOMEPAGE="https://launchpad.net/swift" -EGIT_REPO_URI="https://github.com/openstack/swift.git" -EGIT_BRANCH="stable/ocata" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="proxy account container object +memcached" -REQUIRED_USE="|| ( proxy account container object )" - -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - -RDEPEND=" - ${CDEPEND} - >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - memcached? ( net-misc/memcached ) - net-misc/rsync[xattr]" - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR - ~ZFS" - if linux_config_exists; then - for module in ${CONFIG_CHECK}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewuser swift - enewgroup swift -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -src_test () { - # https://bugs.launchpad.net/swift/+bug/1249727 - find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die - SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/swift - insinto /etc/swift - - newins "etc/swift.conf-sample" "swift.conf" - newins "etc/rsyncd.conf-sample" "rsyncd.conf" - newins "etc/mime.types-sample" "mime.types-sample" - newins "etc/memcache.conf-sample" "memcache.conf-sample" - newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" - newins "etc/dispersion.conf-sample" "dispersion.conf-sample" - - if use proxy; then - newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" - newins "etc/proxy-server.conf-sample" "proxy-server.conf" - if use memcached; then - sed -i '/depend/a\ - need memcached' "${D}/etc/init.d/swift-proxy" - fi - fi - if use account; then - newinitd "${FILESDIR}/swift-account.initd" "swift-account" - newins "etc/account-server.conf-sample" "account-server.conf" - fi - if use container; then - newinitd "${FILESDIR}/swift-container.initd" "swift-container" - newins "etc/container-server.conf-sample" "container-server.conf" - fi - if use object; then - newinitd "${FILESDIR}/swift-object.initd" "swift-object" - newins "etc/object-server.conf-sample" "object-server.conf" - newins "etc/object-expirer.conf-sample" "object-expirer.conf" - fi - - fowners root:swift "/etc/swift" || die "fowners failed" - fperms 0750 /etc/swift -} - -pkg_postinst() { - elog "Openstack swift will default to using insecure http unless a" - elog "certificate is created in /etc/swift/cert.crt and the associated key" - elog "in /etc/swift/cert.key. These can be created with the following:" - elog " * cd /etc/swift" - elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" -} |