* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/
@ 2015-10-23 20:15 Matt Thode
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode @ 2015-10-23 20:15 UTC (permalink / raw
To: gentoo-commits
commit: c7c1bdf3636478a9bba245d8df282f3a8dccf1d2
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 20:12:42 2015 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 20:14:33 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c1bdf3
updating conf.d for liberty
sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty | 1 +
sys-cluster/neutron/neutron-2015.2.9999.ebuild | 2 +-
sys-cluster/neutron/neutron-7.0.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
new file mode 100644
index 0000000..9a2d52c
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
@@ -0,0 +1 @@
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/neutron-2015.2.9999.ebuild b/sys-cluster/neutron/neutron-2015.2.9999.ebuild
index c5cca91..29b2e16 100644
--- a/sys-cluster/neutron/neutron-2015.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.2.9999.ebuild
@@ -239,7 +239,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
fi
diropts -m 755 -o neutron -g neutron
dodir /var/log/neutron /var/lib/neutron
diff --git a/sys-cluster/neutron/neutron-7.0.0.ebuild b/sys-cluster/neutron/neutron-7.0.0.ebuild
index 68bd9ab..c0dc8d0 100644
--- a/sys-cluster/neutron/neutron-7.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-7.0.0.ebuild
@@ -238,7 +238,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
fi
diropts -m 755 -o neutron -g neutron
dodir /var/log/neutron /var/lib/neutron
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/
@ 2016-02-10 1:16 Matt Thode
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode @ 2016-02-10 1:16 UTC (permalink / raw
To: gentoo-commits
commit: 71beb2a9050f7ef521d53d9cbb544a8f89192d44
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 01:09:52 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 01:09:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71beb2a9
sys-cluster/neutron: cleanup
Package-Manager: portage-2.2.26
.../neutron/files/CVE-2015-5240_2015.1.1.patch | 155 -------------
sys-cluster/neutron/neutron-2015.1.9999.ebuild | 252 ---------------------
2 files changed, 407 deletions(-)
diff --git a/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch b/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch
deleted file mode 100644
index ccb2a66..0000000
--- a/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 8138e2fe38ad2cde5963685df47b1e4286776352 Mon Sep 17 00:00:00 2001
-From: Kevin Benton <blak111@gmail.com>
-Date: Tue, 25 Aug 2015 22:03:27 -0700
-Subject: [PATCH] Stop device_owner from being set to 'network:*'
-
-This patch adjusts the FieldCheck class in the policy engine to
-allow a regex rule. It then leverages that to prevent users from
-setting the device_owner field to anything that starts with
-'network:' on networks which they do not own.
-
-This policy adjustment is necessary because any ports with a
-device_owner that starts with 'network:' will not have any security
-group rules applied because it is assumed they are trusted network
-devices (e.g. router ports, DHCP ports, etc). These security rules
-include the anti-spoofing protection for DHCP, IPv6 ICMP messages,
-and IP headers.
-
-Without this policy adjustment, tenants can abuse this trust when
-connected to a shared network with other tenants by setting their
-VM port's device_owner field to 'network:<anything>' and hijack other
-tenants' traffic via DHCP spoofing or MAC/IP spoofing.
-
-Closes-Bug: #1489111
-Change-Id: Ia64cf16142e0e4be44b5b0ed72c8e00792d770f9
-(cherry picked from commit 959a2f28cbbfc309381ea9ffb55090da6fb9c78f)
----
- etc/policy.json | 3 +++
- neutron/api/v2/attributes.py | 2 +-
- neutron/policy.py | 3 +++
- neutron/tests/etc/policy.json | 3 +++
- neutron/tests/unit/test_policy.py | 16 ++++++++++++++++
- 5 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/etc/policy.json b/etc/policy.json
-index 8a5de9b..0f04eb2 100644
---- a/etc/policy.json
-+++ b/etc/policy.json
-@@ -46,7 +46,9 @@
- "update_network:router:external": "rule:admin_only",
- "delete_network": "rule:admin_or_owner",
-
-+ "network_device": "field:port:device_owner=~^network:",
- "create_port": "",
-+ "create_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:mac_address": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
-@@ -61,6 +63,7 @@
- "get_port:binding:host_id": "rule:admin_only",
- "get_port:binding:profile": "rule:admin_only",
- "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
-+ "update_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
- "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc",
- "update_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "update_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
-diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
-index b9c179a..9ceee78 100644
---- a/neutron/api/v2/attributes.py
-+++ b/neutron/api/v2/attributes.py
-@@ -766,7 +766,7 @@ RESOURCE_ATTRIBUTE_MAP = {
- 'is_visible': True},
- 'device_owner': {'allow_post': True, 'allow_put': True,
- 'validate': {'type:string': DEVICE_OWNER_MAX_LEN},
-- 'default': '',
-+ 'default': '', 'enforce_policy': True,
- 'is_visible': True},
- 'tenant_id': {'allow_post': True, 'allow_put': False,
- 'validate': {'type:string': TENANT_ID_MAX_LEN},
-diff --git a/neutron/policy.py b/neutron/policy.py
-index 9e586dd..961ae21 100644
---- a/neutron/policy.py
-+++ b/neutron/policy.py
-@@ -335,6 +335,7 @@ class FieldCheck(policy.Check):
-
- self.field = field
- self.value = conv_func(value)
-+ self.regex = re.compile(value[1:]) if value.startswith('~') else None
-
- def __call__(self, target_dict, cred_dict, enforcer):
- target_value = target_dict.get(self.field)
-@@ -344,6 +345,8 @@ class FieldCheck(policy.Check):
- "%(target_dict)s",
- {'field': self.field, 'target_dict': target_dict})
- return False
-+ if self.regex:
-+ return bool(self.regex.match(target_value))
- return target_value == self.value
-
-
-diff --git a/neutron/tests/etc/policy.json b/neutron/tests/etc/policy.json
-index 8a5de9b..0f04eb2 100644
---- a/neutron/tests/etc/policy.json
-+++ b/neutron/tests/etc/policy.json
-@@ -46,7 +46,9 @@
- "update_network:router:external": "rule:admin_only",
- "delete_network": "rule:admin_or_owner",
-
-+ "network_device": "field:port:device_owner=~^network:",
- "create_port": "",
-+ "create_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:mac_address": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "create_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
-@@ -61,6 +63,7 @@
- "get_port:binding:host_id": "rule:admin_only",
- "get_port:binding:profile": "rule:admin_only",
- "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
-+ "update_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
- "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc",
- "update_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
- "update_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
-diff --git a/neutron/tests/unit/test_policy.py b/neutron/tests/unit/test_policy.py
-index 3888ce3..4be404f 100644
---- a/neutron/tests/unit/test_policy.py
-+++ b/neutron/tests/unit/test_policy.py
-@@ -232,6 +232,7 @@ class NeutronPolicyTestCase(base.BaseTestCase):
- "regular_user": "role:user",
- "shared": "field:networks:shared=True",
- "external": "field:networks:router:external=True",
-+ "network_device": "field:port:device_owner=~^network:",
- "default": '@',
-
- "create_network": "rule:admin_or_owner",
-@@ -243,6 +244,7 @@ class NeutronPolicyTestCase(base.BaseTestCase):
- "create_subnet": "rule:admin_or_network_owner",
- "create_port:mac": "rule:admin_or_network_owner or "
- "rule:context_is_advsvc",
-+ "create_port:device_owner": "not rule:network_device",
- "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
- "get_port": "rule:admin_or_owner or rule:context_is_advsvc",
- "delete_port": "rule:admin_or_owner or rule:context_is_advsvc",
-@@ -312,6 +314,20 @@ class NeutronPolicyTestCase(base.BaseTestCase):
- self._test_nonadmin_action_on_attr('create', 'shared', True,
- common_policy.PolicyNotAuthorized)
-
-+ def test_create_port_device_owner_regex(self):
-+ blocked_values = ('network:', 'network:abdef', 'network:dhcp',
-+ 'network:router_interface')
-+ for val in blocked_values:
-+ self._test_advsvc_action_on_attr(
-+ 'create', 'port', 'device_owner', val,
-+ common_policy.PolicyNotAuthorized
-+ )
-+ ok_values = ('network', 'networks', 'my_network:test', 'my_network:')
-+ for val in ok_values:
-+ self._test_advsvc_action_on_attr(
-+ 'create', 'port', 'device_owner', val
-+ )
-+
- def test_advsvc_get_network_works(self):
- self._test_advsvc_action_on_attr('get', 'network', 'shared', False)
-
---
-1.9.1
-
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
deleted file mode 100644
index 84d68fc..0000000
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-EGIT_BRANCH="stable/kilo"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
- compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
- || ( openvswitch linuxbridge ) )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- app-admin/sudo
- test? (
- ${RDEPEND}
- >=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
- <dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
- !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
- <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
- <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- 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/eventlet-0.16.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
- >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
- >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
- !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
- dev-python/jsonrpclib[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
- <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
- <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- compute-only? (
- >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
- )
- sqlite? (
- >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
- )
- mysql? (
- dev-python/mysql-python
- >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
- )
- postgres? (
- dev-python/psycopg:2
- >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
- )
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
- <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
- <dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
- <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
- <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
- <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
- <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
- <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
- <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
- <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
- <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
- <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
- <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
- dev-python/pyudev[${PYTHON_USEDEP}]
- sys-apps/iproute2
- net-misc/bridge-utils
- net-firewall/ipset
- net-firewall/iptables
- net-firewall/ebtables
- openvswitch? ( net-misc/openvswitch )
- ipv6? ( net-misc/radvd )
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-PATCHES=(
-)
-
-pkg_setup() {
- 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
- 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_compile_all() {
- use doc && make -C doc html
-}
-
-python_test() {
- # https://bugs.launchpad.net/neutron/+bug/1234857
- # https://bugs.launchpad.net/swift/+bug/1249727
- # https://bugs.launchpad.net/neutron/+bug/1251657
- # Move tests out that attempt net connection, have failures
- mv $(find . -name test_ovs_tunnel.py) . || die
- sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
- -e 's:test_start_random_port_with_ipv6:_&:' \
- -i neutron/tests/unit/test_wsgi.py || die
- testr init
- testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
- distutils-r1_python_install
- 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
- rm "${D}etc/neutron/quantum"
- 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"
-
- insopts -m 0644
- insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
- doins -r "neutron/db/migration/alembic_migrations/versions"
-
- #add sudoers definitions for user neutron
- insinto /etc/sudoers.d/
- insopts -m 0440 -o root -g root
- newins "${FILESDIR}/neutron.sudoersd" neutron
-
- #remove superfluous stuff
- rm -R "${D}/usr/etc/"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/
@ 2016-10-06 18:36 Matt Thode
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode @ 2016-10-06 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 0f4820951af6654ccaa79d9298b6c1c99028e1e1
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 18:33:21 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 18:34:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f482095
sys-cluster/neutron: cleanup
Package-Manager: portage-2.3.0
sys-cluster/neutron/files/neutron-linuxbridge-agent.confd | 2 +-
sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty | 1 -
sys-cluster/neutron/files/neutron-ovs-cleanup.confd | 1 -
sys-cluster/neutron/neutron-2016.1.9999.ebuild | 2 +-
sys-cluster/neutron/neutron-2016.2.9999.ebuild | 2 +-
sys-cluster/neutron/neutron-8.2.0.ebuild | 2 +-
sys-cluster/neutron/neutron-9.0.0.ebuild | 2 +-
7 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
index fdd4ed4..9a2d52c 100644
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
@@ -1 +1 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
deleted file mode 100644
index 9a2d52c..00000000
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd b/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
deleted file mode 100644
index eba422c..00000000
--- a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
index e0eda23..bff65d2 100644
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
@@ -167,7 +167,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "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
diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
index 1a66a80..726e0f2 100644
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
@@ -180,7 +180,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "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
diff --git a/sys-cluster/neutron/neutron-8.2.0.ebuild b/sys-cluster/neutron/neutron-8.2.0.ebuild
index 943ebb5..a8d6d24 100644
--- a/sys-cluster/neutron/neutron-8.2.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.2.0.ebuild
@@ -166,7 +166,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "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
diff --git a/sys-cluster/neutron/neutron-9.0.0.ebuild b/sys-cluster/neutron/neutron-9.0.0.ebuild
index 5928506..c77faa3 100644
--- a/sys-cluster/neutron/neutron-9.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-9.0.0.ebuild
@@ -179,7 +179,7 @@ python_install() {
fi
if use linuxbridge; then
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/
@ 2018-01-28 4:13 Matt Thode
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode @ 2018-01-28 4:13 UTC (permalink / raw
To: gentoo-commits
commit: a799b22ff524b58d7fd16be5853bc906611c1a04
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 03:46:36 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 04:13:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a799b22f
sys-cluster/neutron: remove ocata
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-cluster/neutron/Manifest | 5 -
sys-cluster/neutron/files/neutron.initd | 13 +-
sys-cluster/neutron/files/neutron.initd-2 | 17 --
sys-cluster/neutron/neutron-10.0.4.ebuild | 237 ------------------------
sys-cluster/neutron/neutron-11.0.2.ebuild | 16 +-
sys-cluster/neutron/neutron-2017.1.9999.ebuild | 238 -------------------------
sys-cluster/neutron/neutron-2017.2.9999.ebuild | 16 +-
7 files changed, 21 insertions(+), 521 deletions(-)
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index c1f6082d504..816c282aab8 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,10 +1,5 @@
-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
diff --git a/sys-cluster/neutron/files/neutron.initd b/sys-cluster/neutron/files/neutron.initd
index 803ccb58f70..26bf768ddff 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 7a7dad6e686..00000000000
--- 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 482826b624b..00000000000
--- 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 575c14d4433..cb3c6335654 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 1872be64f63..00000000000
--- 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 d0129f9df24..61871bc47a5 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-28 4:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-28 4:13 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/ Matt Thode
-- strict thread matches above, loose matches on Subject: below --
2016-10-06 18:36 Matt Thode
2016-02-10 1:16 Matt Thode
2015-10-23 20:15 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox