Move to pbr.
Closes bug 1179007 Change-Id: I3666e373389da6ad9a21a195a42918d4dec50cb5
This commit is contained in:
Monty Taylor
parent
449157d28b
commit
7c983cac33
|
|
@ -4,6 +4,7 @@ build-stamp
|
|||
ChangeLog
|
||||
.coverage
|
||||
covhtml/
|
||||
dist/
|
||||
doc/build
|
||||
*.DS_Store
|
||||
*.pyc
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@ module=processutils
|
|||
module=redhat-eventlet.patch
|
||||
module=rpc
|
||||
module=service
|
||||
module=setup
|
||||
module=rootwrap
|
||||
module=threadgroup
|
||||
module=timeutils
|
||||
module=uuidutils
|
||||
module=version
|
||||
|
||||
# The base module to hold the copy of openstack.common
|
||||
base=quantum
|
||||
|
|
|
|||
100
setup.cfg
100
setup.cfg
|
|
@ -1,19 +1,96 @@
|
|||
[metadata]
|
||||
name = quantum
|
||||
version = 2013.2
|
||||
summary = OpenStack Networking
|
||||
description-file =
|
||||
README
|
||||
author = OpenStack
|
||||
author-email = openstack-dev@lists.openstack.org
|
||||
home-page = http://www.openstack.org/
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Information Technology
|
||||
Intended Audience :: System Administrators
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 2.6
|
||||
|
||||
[files]
|
||||
packages =
|
||||
quantum
|
||||
data_files =
|
||||
etc/quantum =
|
||||
etc/api-paste.ini
|
||||
etc/dhcp_agent.ini
|
||||
etc/l3_agent.ini
|
||||
etc/lbaas_agent.ini
|
||||
etc/metadata_agent.ini
|
||||
etc/policy.json
|
||||
etc/quantum.conf
|
||||
etc/rootwrap.conf
|
||||
etc/quantum/rootwrap.d =
|
||||
etc/quantum/rootwrap.d/dhcp.filters
|
||||
etc/quantum/rootwrap.d/iptables-firewall.filters
|
||||
etc/quantum/rootwrap.d/l3.filters
|
||||
etc/quantum/rootwrap.d/lbaas-haproxy.filters
|
||||
etc/quantum/rootwrap.d/linuxbridge-plugin.filters
|
||||
etc/quantum/rootwrap.d/nec-plugin.filters
|
||||
etc/quantum/rootwrap.d/openvswitch-plugin.filters
|
||||
etc/quantum/rootwrap.d/ryu-plugin.filters
|
||||
etc/init.d = etc/init.d/quantum-server
|
||||
etc/quantum/plugins/bigswitch = etc/quantum/plugins/bigswitch/restproxy.ini
|
||||
etc/quantum/plugins/brocade = etc/quantum/plugins/brocade/brocade.ini
|
||||
etc/quantum/plugins/cisco = etc/quantum/plugins/cisco/cisco_plugins.ini
|
||||
etc/quantum/plugins/hyperv = etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini
|
||||
etc/quantum/plugins/linuxbridge = etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
|
||||
etc/quantum/plugins/metaplugin = etc/quantum/plugins/metaplugin/metaplugin.ini
|
||||
etc/quantum/plugins/midonet = etc/quantum/plugins/midonet/midonet.ini
|
||||
etc/quantum/plugins/mlnx = etc/quantum/plugins/mlnx/mlnx_conf.ini
|
||||
etc/quantum/plugins/nec = etc/quantum/plugins/nec/nec.ini
|
||||
etc/quantum/plugins/nicira = etc/quantum/plugins/nicira/nvp.ini
|
||||
etc/quantum/plugins/openvswitch = etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
|
||||
etc/quantum/plugins/plumgrid = etc/quantum/plugins/plumgrid/plumgrid.ini
|
||||
etc/quantum/plugins/ryu = etc/quantum/plugins/ryu/ryu.ini
|
||||
scripts =
|
||||
bin/quantum-rootwrap
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
quantum.hooks.setup_hook
|
||||
|
||||
[pbr]
|
||||
single-version-externally-mananged = true
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
quantum-check-nvp-config = quantum.plugins.nicira.check_nvp_config:main
|
||||
quantum-db-manage = quantum.db.migration.cli:main
|
||||
quantum-debug = quantum.debug.shell:main
|
||||
quantum-dhcp-agent = quantum.agent.dhcp_agent:main
|
||||
quantum-dhcp-agent-dnsmasq-lease-update = quantum.agent.linux.dhcp:Dnsmasq.lease_update
|
||||
quantum-hyperv-agent = quantum.plugins.hyperv.agent.hyperv_quantum_agent:main
|
||||
quantum-l3-agent = quantum.agent.l3_agent:main
|
||||
quantum-lbaas-agent = quantum.plugins.services.agent_loadbalancer.agent:main
|
||||
quantum-linuxbridge-agent = quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main
|
||||
quantum-metadata-agent = quantum.agent.metadata.agent:main
|
||||
quantum-mlnx-agent = quantum.plugins.mlnx.agent.eswitch_quantum_agent:main
|
||||
quantum-nec-agent = quantum.plugins.nec.agent.nec_quantum_agent:main
|
||||
quantum-netns-cleanup = quantum.agent.netns_cleanup_util:main
|
||||
quantum-ns-metadata-proxy = quantum.agent.metadata.namespace_proxy:main
|
||||
quantum-openvswitch-agent = quantum.plugins.openvswitch.agent.ovs_quantum_agent:main
|
||||
quantum-ovs-cleanup = quantum.agent.ovs_cleanup_util:main
|
||||
quantum-ryu-agent = quantum.plugins.ryu.agent.ryu_quantum_agent:main
|
||||
quantum-server = quantum.server:main
|
||||
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
build-dir = doc/build
|
||||
source-dir = doc/source
|
||||
|
||||
[nosetests]
|
||||
# NOTE(jkoelker) To run the test suite under nose install the following
|
||||
# coverage http://pypi.python.org/pypi/coverage
|
||||
# tissue http://pypi.python.org/pypi/tissue (pep8 checker)
|
||||
# openstack-nose https://github.com/jkoelker/openstack-nose
|
||||
verbosity=2
|
||||
cover-package = quantum
|
||||
cover-html = true
|
||||
cover-erase = true
|
||||
where=quantum/tests/unit
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
|
|
@ -27,4 +104,3 @@ domain = quantum
|
|||
domain = quantum
|
||||
output_dir = quantum/locale
|
||||
input_file = quantum/locale/quantum.pot
|
||||
|
||||
|
|
|
|||
176
setup.py
176
setup.py
|
|
@ -1,183 +1,21 @@
|
|||
# Copyright 2011 OpenStack Foundation
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# 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
|
||||
# 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.
|
||||
# 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
|
||||
import sys
|
||||
|
||||
from quantum.openstack.common import setup
|
||||
|
||||
requires = setup.parse_requirements()
|
||||
depend_links = setup.parse_dependency_links()
|
||||
|
||||
if sys.platform == 'win32':
|
||||
requires.append('pywin32')
|
||||
requires.append('wmi')
|
||||
requires.remove('pyudev')
|
||||
|
||||
Name = 'quantum'
|
||||
Url = "https://launchpad.net/quantum"
|
||||
Version = setup.get_version(Name, '2013.2')
|
||||
License = 'Apache License 2.0'
|
||||
Author = 'OpenStack'
|
||||
AuthorEmail = 'openstack-dev@lists.openstack.org'
|
||||
Maintainer = ''
|
||||
Summary = 'Quantum (virtual network service)'
|
||||
ShortDescription = Summary
|
||||
Description = Summary
|
||||
|
||||
EagerResources = [
|
||||
'quantum',
|
||||
]
|
||||
|
||||
config_path = 'etc/quantum/'
|
||||
init_path = 'etc/init.d'
|
||||
rootwrap_path = 'etc/quantum/rootwrap.d'
|
||||
ovs_plugin_config_path = 'etc/quantum/plugins/openvswitch'
|
||||
bigswitch_plugin_config_path = 'etc/quantum/plugins/bigswitch'
|
||||
brocade_plugin_config_path = 'etc/quantum/plugins/brocade'
|
||||
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'
|
||||
hyperv_plugin_config_path = 'etc/quantum/plugins/hyperv'
|
||||
plumgrid_plugin_config_path = 'etc/quantum/plugins/plumgrid'
|
||||
midonet_plugin_config_path = 'etc/quantum/plugins/midonet'
|
||||
mlnx_plugin_config_path = 'etc/quantum/plugins/mlnx'
|
||||
|
||||
if sys.platform == 'win32':
|
||||
# Windows doesn't have an "/etc" directory equivalent
|
||||
DataFiles = []
|
||||
|
||||
ConsoleScripts = [
|
||||
'quantum-hyperv-agent = '
|
||||
'quantum.plugins.hyperv.agent.hyperv_quantum_agent:main',
|
||||
'quantum-server = quantum.server:main',
|
||||
'quantum-db-manage = quantum.db.migration.cli:main',
|
||||
]
|
||||
|
||||
ProjectScripts = []
|
||||
else:
|
||||
DataFiles = [
|
||||
(config_path,
|
||||
['etc/quantum.conf',
|
||||
'etc/rootwrap.conf',
|
||||
'etc/api-paste.ini',
|
||||
'etc/policy.json',
|
||||
'etc/dhcp_agent.ini',
|
||||
'etc/l3_agent.ini',
|
||||
'etc/metadata_agent.ini',
|
||||
'etc/lbaas_agent.ini']),
|
||||
(rootwrap_path,
|
||||
['etc/quantum/rootwrap.d/dhcp.filters',
|
||||
'etc/quantum/rootwrap.d/iptables-firewall.filters',
|
||||
'etc/quantum/rootwrap.d/l3.filters',
|
||||
'etc/quantum/rootwrap.d/linuxbridge-plugin.filters',
|
||||
'etc/quantum/rootwrap.d/nec-plugin.filters',
|
||||
'etc/quantum/rootwrap.d/openvswitch-plugin.filters',
|
||||
'etc/quantum/rootwrap.d/ryu-plugin.filters',
|
||||
'etc/quantum/rootwrap.d/lbaas-haproxy.filters']),
|
||||
(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/cisco_plugins.ini']),
|
||||
(bigswitch_plugin_config_path,
|
||||
['etc/quantum/plugins/bigswitch/restproxy.ini']),
|
||||
(brocade_plugin_config_path,
|
||||
['etc/quantum/plugins/brocade/brocade.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']),
|
||||
(hyperv_plugin_config_path,
|
||||
['etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini']),
|
||||
(plumgrid_plugin_config_path,
|
||||
['etc/quantum/plugins/plumgrid/plumgrid.ini']),
|
||||
(midonet_plugin_config_path,
|
||||
['etc/quantum/plugins/midonet/midonet.ini']),
|
||||
(mlnx_plugin_config_path,
|
||||
['etc/quantum/plugins/mlnx/mlnx_conf.ini']),
|
||||
]
|
||||
|
||||
ConsoleScripts = [
|
||||
'quantum-dhcp-agent = quantum.agent.dhcp_agent:main',
|
||||
'quantum-dhcp-agent-dnsmasq-lease-update ='
|
||||
'quantum.agent.linux.dhcp:Dnsmasq.lease_update',
|
||||
'quantum-netns-cleanup = quantum.agent.netns_cleanup_util:main',
|
||||
'quantum-l3-agent = quantum.agent.l3_agent:main',
|
||||
'quantum-linuxbridge-agent ='
|
||||
'quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main',
|
||||
'quantum-metadata-agent ='
|
||||
'quantum.agent.metadata.agent:main',
|
||||
'quantum-ns-metadata-proxy ='
|
||||
'quantum.agent.metadata.namespace_proxy: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',
|
||||
'quantum-debug = quantum.debug.shell:main',
|
||||
'quantum-ovs-cleanup = quantum.agent.ovs_cleanup_util:main',
|
||||
'quantum-db-manage = quantum.db.migration.cli:main',
|
||||
('quantum-lbaas-agent = '
|
||||
'quantum.plugins.services.agent_loadbalancer.agent:main'),
|
||||
('quantum-check-nvp-config = '
|
||||
'quantum.plugins.nicira.check_nvp_config:main'),
|
||||
('quantum-mlnx-agent ='
|
||||
'quantum.plugins.mlnx.agent.eswitch_quantum_agent:main'),
|
||||
]
|
||||
|
||||
ProjectScripts = [
|
||||
'bin/quantum-rootwrap',
|
||||
]
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
name=Name,
|
||||
version=Version,
|
||||
url=Url,
|
||||
author=Author,
|
||||
author_email=AuthorEmail,
|
||||
description=ShortDescription,
|
||||
long_description=Description,
|
||||
license=License,
|
||||
classifiers=[
|
||||
'Environment :: OpenStack',
|
||||
'Intended Audience :: System Administrators',
|
||||
'Intended Audience :: Information Technology',
|
||||
'License :: OSI Approved :: Apache Software License',
|
||||
'Operating System :: POSIX :: Linux',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
],
|
||||
scripts=ProjectScripts,
|
||||
install_requires=requires,
|
||||
dependency_links=depend_links,
|
||||
include_package_data=True,
|
||||
setup_requires=['setuptools_git>=0.4'],
|
||||
packages=setuptools.find_packages('.'),
|
||||
cmdclass=setup.get_cmdclass(),
|
||||
data_files=DataFiles,
|
||||
eager_resources=EagerResources,
|
||||
entry_points={'console_scripts': ConsoleScripts},
|
||||
)
|
||||
setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
|
||||
d2to1=True)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
d2to1>=0.2.10,<0.3
|
||||
pbr>=0.5,<0.6
|
||||
Paste
|
||||
PasteDeploy>=1.5.0
|
||||
Routes>=1.12.3
|
||||
|
|
|
|||
Loading…
Reference in New Issue