From e61cf215bf823c754bcdc95e2bd6e2a823f24d8c Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 30 Jul 2013 21:56:15 +0800 Subject: [PATCH] Adds the setup.cfg as it is from release tarballs. --- debian/patches/fix-setup.cfg.patch | 242 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 243 insertions(+) create mode 100644 debian/patches/fix-setup.cfg.patch diff --git a/debian/patches/fix-setup.cfg.patch b/debian/patches/fix-setup.cfg.patch new file mode 100644 index 000000000..9a673c0da --- /dev/null +++ b/debian/patches/fix-setup.cfg.patch @@ -0,0 +1,242 @@ +Description: Fix setup.cfg + The setup.cfg from github is different from the one on the release tarballs. + The one in github simply doesn't work and installs only partially Neutron. + This patch uses what's in the release tarballs. +Author: Thomas Goirand +Origin: upstream, http://tarballs.openstack.org/neutron/neutron-2013.2.b2.tar.gz +Last-Update: 2013-07-30 + +--- neutron-2013.2~b2.orig/setup.cfg ++++ neutron-2013.2~b2/setup.cfg +@@ -2,118 +2,118 @@ + name = neutron + version = 2013.2 + summary = OpenStack Networking +-description-file = +- README.rst ++description-file = ++ README.rst + 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 ++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 = +- neutron +- quantum +-data_files = +- etc/neutron = +- etc/api-paste.ini +- etc/dhcp_agent.ini +- etc/l3_agent.ini +- etc/lbaas_agent.ini +- etc/metadata_agent.ini +- etc/policy.json +- etc/neutron.conf +- etc/rootwrap.conf +- etc/neutron/rootwrap.d = +- etc/neutron/rootwrap.d/dhcp.filters +- etc/neutron/rootwrap.d/iptables-firewall.filters +- etc/neutron/rootwrap.d/l3.filters +- etc/neutron/rootwrap.d/lbaas-haproxy.filters +- etc/neutron/rootwrap.d/linuxbridge-plugin.filters +- etc/neutron/rootwrap.d/nec-plugin.filters +- etc/neutron/rootwrap.d/openvswitch-plugin.filters +- etc/neutron/rootwrap.d/ryu-plugin.filters +- etc/init.d = etc/init.d/neutron-server +- etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini +- etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini +- etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_plugins.ini +- etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini +- etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini +- etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini +- etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini +- etc/neutron/plugins/ml2 = etc/neutron/plugins/ml2/ml2_conf.ini +- etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini +- etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini +- etc/neutron/plugins/nicira = etc/neutron/plugins/nicira/nvp.ini +- etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +- etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini +- etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini +-scripts = +- bin/quantum-rootwrap +- bin/neutron-rootwrap +- bin/quantum-rootwrap-xen-dom0 +- bin/neutron-rootwrap-xen-dom0 ++packages = ++ neutron ++ quantum ++data_files = ++ etc/neutron = ++ etc/api-paste.ini ++ etc/dhcp_agent.ini ++ etc/l3_agent.ini ++ etc/lbaas_agent.ini ++ etc/metadata_agent.ini ++ etc/policy.json ++ etc/neutron.conf ++ etc/rootwrap.conf ++ etc/neutron/rootwrap.d = ++ etc/neutron/rootwrap.d/dhcp.filters ++ etc/neutron/rootwrap.d/iptables-firewall.filters ++ etc/neutron/rootwrap.d/l3.filters ++ etc/neutron/rootwrap.d/lbaas-haproxy.filters ++ etc/neutron/rootwrap.d/linuxbridge-plugin.filters ++ etc/neutron/rootwrap.d/nec-plugin.filters ++ etc/neutron/rootwrap.d/openvswitch-plugin.filters ++ etc/neutron/rootwrap.d/ryu-plugin.filters ++ etc/init.d = etc/init.d/neutron-server ++ etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini ++ etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini ++ etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_plugins.ini ++ etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini ++ etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini ++ etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini ++ etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini ++ etc/neutron/plugins/ml2 = etc/neutron/plugins/ml2/ml2_conf.ini ++ etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini ++ etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini ++ etc/neutron/plugins/nicira = etc/neutron/plugins/nicira/nvp.ini ++ etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini ++ etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini ++ etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini ++scripts = ++ bin/quantum-rootwrap ++ bin/neutron-rootwrap ++ bin/quantum-rootwrap-xen-dom0 ++ bin/neutron-rootwrap-xen-dom0 + + [global] +-setup-hooks = +- pbr.hooks.setup_hook +- neutron.hooks.setup_hook ++setup-hooks = ++ pbr.hooks.setup_hook ++ neutron.hooks.setup_hook + + [entry_points] +-console_scripts = +- neutron-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main +- neutron-db-manage = neutron.db.migration.cli:main +- neutron-debug = neutron.debug.shell:main +- neutron-dhcp-agent = neutron.agent.dhcp_agent:main +- neutron-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update +- neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main +- neutron-l3-agent = neutron.agent.l3_agent:main +- neutron-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main +- neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main +- neutron-metadata-agent = neutron.agent.metadata.agent:main +- neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main +- neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main +- neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main +- neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main +- neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main +- neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main +- neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main +- neutron-server = neutron.server:main +- quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main +- quantum-db-manage = neutron.db.migration.cli:main +- quantum-debug = neutron.debug.shell:main +- quantum-dhcp-agent = neutron.agent.dhcp_agent:main +- quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update +- quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main +- quantum-l3-agent = neutron.agent.l3_agent:main +- quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main +- quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main +- quantum-metadata-agent = neutron.agent.metadata.agent:main +- quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main +- quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main +- quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main +- quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main +- quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main +- quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main +- quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main +- quantum-server = neutron.server:main +-neutron.ml2.type_drivers = +- flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver +- local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver +- vlan = neutron.plugins.ml2.drivers.type_vlan:VlanTypeDriver +- gre = neutron.plugins.ml2.drivers.type_gre:GreTypeDriver +- vxlan = neutron.plugins.ml2.drivers.type_vxlan:VxlanTypeDriver +-neutron.ml2.mechanism_drivers = +- logger = neutron.tests.unit.ml2.drivers.mechanism_logger:LoggerMechanismDriver +- test = neutron.tests.unit.ml2.drivers.mechanism_test:TestMechanismDriver ++console_scripts = ++ neutron-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main ++ neutron-db-manage = neutron.db.migration.cli:main ++ neutron-debug = neutron.debug.shell:main ++ neutron-dhcp-agent = neutron.agent.dhcp_agent:main ++ neutron-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update ++ neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main ++ neutron-l3-agent = neutron.agent.l3_agent:main ++ neutron-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main ++ neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main ++ neutron-metadata-agent = neutron.agent.metadata.agent:main ++ neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main ++ neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main ++ neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main ++ neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main ++ neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main ++ neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main ++ neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main ++ neutron-server = neutron.server:main ++ quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main ++ quantum-db-manage = neutron.db.migration.cli:main ++ quantum-debug = neutron.debug.shell:main ++ quantum-dhcp-agent = neutron.agent.dhcp_agent:main ++ quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update ++ quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main ++ quantum-l3-agent = neutron.agent.l3_agent:main ++ quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main ++ quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main ++ quantum-metadata-agent = neutron.agent.metadata.agent:main ++ quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main ++ quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main ++ quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main ++ quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main ++ quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main ++ quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main ++ quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main ++ quantum-server = neutron.server:main ++neutron.ml2.type_drivers = ++ flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver ++ local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver ++ vlan = neutron.plugins.ml2.drivers.type_vlan:VlanTypeDriver ++ gre = neutron.plugins.ml2.drivers.type_gre:GreTypeDriver ++ vxlan = neutron.plugins.ml2.drivers.type_vxlan:VxlanTypeDriver ++neutron.ml2.mechanism_drivers = ++ logger = neutron.tests.unit.ml2.drivers.mechanism_logger:LoggerMechanismDriver ++ test = neutron.tests.unit.ml2.drivers.mechanism_test:TestMechanismDriver + + [build_sphinx] + all_files = 1 +@@ -133,3 +133,9 @@ domain = neutron + domain = neutron + output_dir = neutron/locale + input_file = neutron/locale/neutron.pot ++ ++[egg_info] ++tag_build = ++tag_date = 0 ++tag_svn_revision = 0 ++ diff --git a/debian/patches/series b/debian/patches/series index 385c8b781..e7906d661 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ better-config-default.patch +fix-setup.cfg.patch -- 2.45.2