193d699727
Fix bug 1037815 Summary: Copy/paste the essential parts of the rootwrap mechanism from nova/cinder into quantum. This includes the core changes to filter.py and wrapper.py which deal with loading filters from files pointed to by rootwrap.conf Detailed changes: Transliterate the old rootwrap/*-agent.py files to new format, and put the results in etc/quantum/rootwrap.d Delete the *-agent.py files. Add conf to point to etc/quantum/rootwrap.d Add a unit test cribbed from nova to exercise the filter mechanism Add a unit test to exercise the actual filtered execution Note that as written, this patch does not set the default execute mechanism (in the agent .ini files) to rootwrap, leaves it as sudo. That can be done in a followon change, or in distro specific packaging. Note also that there is still work to do around finishing and testing the filter specs themselves. We've decided that that is out of scope for this patch. Change-Id: I9aba6adc5ba40b6145be5fa38c5ece3b666ae5ca
118 lines
4.0 KiB
Python
118 lines
4.0 KiB
Python
# Copyright 2011 OpenStack, LLC
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import setuptools
|
|
|
|
from quantum.openstack.common import setup
|
|
|
|
setup.write_vcsversion('quantum/vcsversion.py')
|
|
|
|
from quantum import version
|
|
|
|
requires = setup.parse_requirements()
|
|
depend_links = setup.parse_dependency_links()
|
|
|
|
Name = 'quantum'
|
|
Url = "https://launchpad.net/quantum"
|
|
Version = version.canonical_version_string()
|
|
License = 'Apache License 2.0'
|
|
Author = 'Netstack'
|
|
AuthorEmail = 'netstack@lists.launchpad.net'
|
|
Maintainer = ''
|
|
Summary = 'Quantum (virtual network service)'
|
|
ShortDescription = Summary
|
|
Description = Summary
|
|
|
|
EagerResources = [
|
|
'quantum',
|
|
]
|
|
|
|
ProjectScripts = [
|
|
'bin/quantum-rootwrap',
|
|
]
|
|
|
|
config_path = 'etc/quantum/'
|
|
init_path = 'etc/init.d'
|
|
ovs_plugin_config_path = 'etc/quantum/plugins/openvswitch'
|
|
cisco_plugin_config_path = 'etc/quantum/plugins/cisco'
|
|
linuxbridge_plugin_config_path = 'etc/quantum/plugins/linuxbridge'
|
|
nvp_plugin_config_path = 'etc/quantum/plugins/nicira'
|
|
ryu_plugin_config_path = 'etc/quantum/plugins/ryu'
|
|
meta_plugin_config_path = 'etc/quantum/plugins/metaplugin'
|
|
nec_plugin_config_path = 'etc/quantum/plugins/nec'
|
|
|
|
DataFiles = [
|
|
(config_path,
|
|
['etc/quantum.conf',
|
|
'etc/rootwrap.conf',
|
|
'etc/api-paste.ini',
|
|
'etc/policy.json',
|
|
'etc/dhcp_agent.ini']),
|
|
(init_path, ['etc/init.d/quantum-server']),
|
|
(ovs_plugin_config_path,
|
|
['etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini']),
|
|
(cisco_plugin_config_path,
|
|
['etc/quantum/plugins/cisco/credentials.ini',
|
|
'etc/quantum/plugins/cisco/l2network_plugin.ini',
|
|
'etc/quantum/plugins/cisco/nexus.ini',
|
|
'etc/quantum/plugins/cisco/ucs.ini',
|
|
'etc/quantum/plugins/cisco/cisco_plugins.ini',
|
|
'etc/quantum/plugins/cisco/db_conn.ini']),
|
|
(linuxbridge_plugin_config_path,
|
|
['etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini']),
|
|
(nvp_plugin_config_path,
|
|
['etc/quantum/plugins/nicira/nvp.ini']),
|
|
(ryu_plugin_config_path, ['etc/quantum/plugins/ryu/ryu.ini']),
|
|
(meta_plugin_config_path,
|
|
['etc/quantum/plugins/metaplugin/metaplugin.ini']),
|
|
(nec_plugin_config_path, ['etc/quantum/plugins/nec/nec.ini']),
|
|
]
|
|
|
|
setuptools.setup(
|
|
name=Name,
|
|
version=Version,
|
|
url=Url,
|
|
author=Author,
|
|
author_email=AuthorEmail,
|
|
description=ShortDescription,
|
|
long_description=Description,
|
|
license=License,
|
|
scripts=ProjectScripts,
|
|
install_requires=requires,
|
|
dependency_links=depend_links,
|
|
include_package_data=False,
|
|
setup_requires=['setuptools_git>=0.4'],
|
|
packages=setuptools.find_packages('.'),
|
|
cmdclass=setup.get_cmdclass(),
|
|
data_files=DataFiles,
|
|
eager_resources=EagerResources,
|
|
entry_points={
|
|
'console_scripts': [
|
|
'quantum-dhcp-agent = quantum.agent.dhcp_agent:main',
|
|
'quantum-dhcp-agent-dnsmasq-lease-update ='
|
|
'quantum.agent.linux.dhcp:Dnsmasq.lease_update',
|
|
'quantum-l3-agent = quantum.agent.l3_nat_agent:main',
|
|
'quantum-linuxbridge-agent ='
|
|
'quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main',
|
|
'quantum-openvswitch-agent ='
|
|
'quantum.plugins.openvswitch.agent.ovs_quantum_agent:main',
|
|
'quantum-ryu-agent = '
|
|
'quantum.plugins.ryu.agent.ryu_quantum_agent:main',
|
|
'quantum-nec-agent = '
|
|
'quantum.plugins.nec.agent.nec_quantum_agent:main',
|
|
'quantum-server = quantum.server:main',
|
|
]
|
|
},
|
|
)
|