| 1 |
commit: 7c2f87d5fb4057d8d06ac2bc5b631e7a61a0489c |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 24 05:51:09 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 24 05:51:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2f87d5 |
| 7 |
|
| 8 |
sys-cluster/neutron: QUEENS |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-cluster/neutron/Manifest | 2 + |
| 13 |
sys-cluster/neutron/metadata.xml | 3 +- |
| 14 |
sys-cluster/neutron/neutron-11.0.2.ebuild | 4 +- |
| 15 |
sys-cluster/neutron/neutron-2017.2.9999.ebuild | 4 +- |
| 16 |
...on-11.0.2.ebuild => neutron-2018.1.9999.ebuild} | 83 +++++++++++----------- |
| 17 |
5 files changed, 50 insertions(+), 46 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest |
| 20 |
index 816c282aab8..a37a6ed3030 100644 |
| 21 |
--- a/sys-cluster/neutron/Manifest |
| 22 |
+++ b/sys-cluster/neutron/Manifest |
| 23 |
@@ -1,5 +1,7 @@ |
| 24 |
DIST neutron-11.0.2.tar.gz 10481255 BLAKE2B 3e2ca3e7e24f21d92823b3d2e44d3fabe17d40cac493797a960b7c20fd906f3bd8ca946ca0729f8e03079f6615e2094f9228a01c2fc1e79ab2cf63bd2a8a5b36 SHA512 ba86e6448d0ae6e95dd4caa41888ee3d4ceeb4353b655b20912871e05cc2440f7d54bef7b119e1cec98da8fe3b9f22966ca8ad05dc3a5931b66b776bef9240cf |
| 25 |
DIST neutron-configs-11.0.2.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a |
| 26 |
DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a |
| 27 |
+DIST neutron-configs-2018.1.9999.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac |
| 28 |
DIST neutron-ml2-plugins-11.0.2.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd |
| 29 |
DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd |
| 30 |
+DIST neutron-ml2-plugins-2018.1.9999.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b |
| 31 |
|
| 32 |
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml |
| 33 |
index b0230af6ee3..d1534a7ad34 100644 |
| 34 |
--- a/sys-cluster/neutron/metadata.xml |
| 35 |
+++ b/sys-cluster/neutron/metadata.xml |
| 36 |
@@ -19,7 +19,8 @@ |
| 37 |
</longdescription> |
| 38 |
<use> |
| 39 |
<flag name="compute-only">Only install things needed on compute hosts</flag> |
| 40 |
- <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag> |
| 41 |
+ <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag> |
| 42 |
+ <flag name="haproxy">haproxy backend support</flag> |
| 43 |
<flag name="l3">Installs the initscripts for the neutron l3 agent service</flag> |
| 44 |
<flag name="metadata">Installs the initscripts for the neutron metadata agent service</flag> |
| 45 |
<flag name="openvswitch">Installs the initscripts for the neutron openvswitch agent service</flag> |
| 46 |
|
| 47 |
diff --git a/sys-cluster/neutron/neutron-11.0.2.ebuild b/sys-cluster/neutron/neutron-11.0.2.ebuild |
| 48 |
index cb3c6335654..1ba919af129 100644 |
| 49 |
--- a/sys-cluster/neutron/neutron-11.0.2.ebuild |
| 50 |
+++ b/sys-cluster/neutron/neutron-11.0.2.ebuild |
| 51 |
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/conf |
| 52 |
LICENSE="Apache-2.0" |
| 53 |
SLOT="0" |
| 54 |
KEYWORDS="amd64 ~arm64 x86" |
| 55 |
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 56 |
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 57 |
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) |
| 58 |
compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server |
| 59 |
|| ( openvswitch linuxbridge ) )" |
| 60 |
@@ -134,7 +134,7 @@ RDEPEND=" |
| 61 |
net-firewall/iptables |
| 62 |
net-firewall/ebtables |
| 63 |
net-firewall/conntrack-tools |
| 64 |
- net-proxy/haproxy |
| 65 |
+ haproxy? ( net-proxy/haproxy ) |
| 66 |
openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) |
| 67 |
ipv6? ( |
| 68 |
net-misc/radvd |
| 69 |
|
| 70 |
diff --git a/sys-cluster/neutron/neutron-2017.2.9999.ebuild b/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
| 71 |
index 61871bc47a5..1c8d9ba8c3a 100644 |
| 72 |
--- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
| 73 |
+++ b/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
| 74 |
@@ -17,7 +17,7 @@ EGIT_BRANCH="stable/pike" |
| 75 |
LICENSE="Apache-2.0" |
| 76 |
SLOT="0" |
| 77 |
KEYWORDS="" |
| 78 |
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 79 |
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 80 |
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) |
| 81 |
compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server |
| 82 |
|| ( openvswitch linuxbridge ) )" |
| 83 |
@@ -135,7 +135,7 @@ RDEPEND=" |
| 84 |
net-firewall/iptables |
| 85 |
net-firewall/ebtables |
| 86 |
net-firewall/conntrack-tools |
| 87 |
- net-proxy/haproxy |
| 88 |
+ haproxy? ( net-proxy/haproxy ) |
| 89 |
openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) |
| 90 |
ipv6? ( |
| 91 |
net-misc/radvd |
| 92 |
|
| 93 |
diff --git a/sys-cluster/neutron/neutron-11.0.2.ebuild b/sys-cluster/neutron/neutron-2018.1.9999.ebuild |
| 94 |
similarity index 76% |
| 95 |
copy from sys-cluster/neutron/neutron-11.0.2.ebuild |
| 96 |
copy to sys-cluster/neutron/neutron-2018.1.9999.ebuild |
| 97 |
index cb3c6335654..ab3477efa1e 100644 |
| 98 |
--- a/sys-cluster/neutron/neutron-11.0.2.ebuild |
| 99 |
+++ b/sys-cluster/neutron/neutron-2018.1.9999.ebuild |
| 100 |
@@ -9,14 +9,22 @@ inherit distutils-r1 linux-info user |
| 101 |
|
| 102 |
DESCRIPTION="A virtual network service for Openstack" |
| 103 |
HOMEPAGE="https://launchpad.net/neutron" |
| 104 |
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz |
| 105 |
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz |
| 106 |
+if [[ ${PV} == *9999 ]];then |
| 107 |
+ inherit git-r3 |
| 108 |
+ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz |
| 109 |
+ https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz" |
| 110 |
+ EGIT_REPO_URI="https://github.com/openstack/neutron.git" |
| 111 |
+ EGIT_BRANCH="stable/queens" |
| 112 |
+else |
| 113 |
+ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz |
| 114 |
+ https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz |
| 115 |
https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
| 116 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 117 |
+fi |
| 118 |
|
| 119 |
LICENSE="Apache-2.0" |
| 120 |
SLOT="0" |
| 121 |
-KEYWORDS="amd64 ~arm64 x86" |
| 122 |
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 123 |
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
| 124 |
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) |
| 125 |
compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server |
| 126 |
|| ( openvswitch linuxbridge ) )" |
| 127 |
@@ -30,7 +38,7 @@ DEPEND=" |
| 128 |
|
| 129 |
RDEPEND=" |
| 130 |
${CDEPEND} |
| 131 |
- dev-python/paste[${PYTHON_USEDEP}] |
| 132 |
+ >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] |
| 133 |
>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
| 134 |
>=dev-python/routes-2.3.1[${PYTHON_USEDEP}] |
| 135 |
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
| 136 |
@@ -42,18 +50,16 @@ RDEPEND=" |
| 137 |
!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}] |
| 138 |
!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}] |
| 139 |
!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] |
| 140 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
| 141 |
+ >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] |
| 142 |
>=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
| 143 |
!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] |
| 144 |
!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] |
| 145 |
!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] |
| 146 |
!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] |
| 147 |
!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] |
| 148 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
| 149 |
- >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] |
| 150 |
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
| 151 |
+ >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] |
| 152 |
>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] |
| 153 |
- >=dev-python/neutron-lib-1.9.0[${PYTHON_USEDEP}] |
| 154 |
+ >=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}] |
| 155 |
>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}] |
| 156 |
>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] |
| 157 |
>=dev-python/ryu-4.14[${PYTHON_USEDEP}] |
| 158 |
@@ -89,43 +95,38 @@ RDEPEND=" |
| 159 |
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
| 160 |
) |
| 161 |
>=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
| 162 |
- >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}] |
| 163 |
+ >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}] |
| 164 |
>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
| 165 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 166 |
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
| 167 |
>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}] |
| 168 |
- >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] |
| 169 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
| 170 |
- >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}] |
| 171 |
- !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}] |
| 172 |
- !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}] |
| 173 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
| 174 |
- >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}] |
| 175 |
- >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}] |
| 176 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
| 177 |
- !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}] |
| 178 |
- >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}] |
| 179 |
- >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}] |
| 180 |
- !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}] |
| 181 |
- >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}] |
| 182 |
- >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}] |
| 183 |
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
| 184 |
- !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}] |
| 185 |
- >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
| 186 |
- >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
| 187 |
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
| 188 |
+ >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] |
| 189 |
+ >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}] |
| 190 |
+ >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}] |
| 191 |
+ >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |
| 192 |
+ >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] |
| 193 |
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] |
| 194 |
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] |
| 195 |
+ >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}] |
| 196 |
+ >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] |
| 197 |
+ >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}] |
| 198 |
+ >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}] |
| 199 |
+ >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] |
| 200 |
+ >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] |
| 201 |
+ >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] |
| 202 |
!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] |
| 203 |
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
| 204 |
- >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}] |
| 205 |
- >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
| 206 |
+ >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] |
| 207 |
+ !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] |
| 208 |
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] |
| 209 |
+ >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] |
| 210 |
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
| 211 |
- >=dev-python/ovs-2.7.0[${PYTHON_USEDEP}] |
| 212 |
- >=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}] |
| 213 |
+ >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}] |
| 214 |
+ >=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}] |
| 215 |
>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] |
| 216 |
>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}] |
| 217 |
>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] |
| 218 |
- >=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}] |
| 219 |
- >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] |
| 220 |
- >=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}] |
| 221 |
+ >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] |
| 222 |
+ >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}] |
| 223 |
+ >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}] |
| 224 |
dev-python/pyudev[${PYTHON_USEDEP}] |
| 225 |
sys-apps/iproute2 |
| 226 |
net-misc/iputils[arping] |
| 227 |
@@ -134,7 +135,7 @@ RDEPEND=" |
| 228 |
net-firewall/iptables |
| 229 |
net-firewall/ebtables |
| 230 |
net-firewall/conntrack-tools |
| 231 |
- net-proxy/haproxy |
| 232 |
+ haproxy? ( net-proxy/haproxy ) |
| 233 |
openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) |
| 234 |
ipv6? ( |
| 235 |
net-misc/radvd |
Archives