From: Thomas Goirand Date: Fri, 2 Aug 2013 14:16:50 +0000 (+0200) Subject: Rewrote debian/patches/better-config-default.patch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b75e8f6b6396f9f8599c4934e32f184c5bb87b38;p=openstack-build%2Fneutron-build.git Rewrote debian/patches/better-config-default.patch Rewritten-From: 2fd8872c396e426c968a8e837d2e5058d9dcfcec --- diff --git a/xenial/debian/patches/better-config-default.patch b/xenial/debian/patches/better-config-default.patch index ac26af957..cf413a111 100644 --- a/xenial/debian/patches/better-config-default.patch +++ b/xenial/debian/patches/better-config-default.patch @@ -1,7 +1,7 @@ Description: A configuration that should work by default Author: Thomas Goirand Forwarded: not-needed -Last-Update: 2013-08-01 +Last-Update: 2013-08-02 --- neutron-2013.2~b2.orig/etc/neutron.conf +++ neutron-2013.2~b2/etc/neutron.conf @@ -10,7 +10,7 @@ Last-Update: 2013-08-01 # Quantum plugin provider module -# core_plugin = -+core_plugin=neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 ++core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 # Advanced service modules # service_plugins = @@ -23,8 +23,13 @@ Last-Update: 2013-08-01 # =========== items for agent management extension ============= # seconds between nodes reporting state to server, should be less than -@@ -330,7 +330,7 @@ signing_dir = /var/lib/quantum/keystone- - # connection = mysql://root:pass@127.0.0.1:3306/quantum +@@ -326,11 +326,10 @@ signing_dir = /var/lib/quantum/keystone- + + [database] + # This line MUST be changed to actually run the plugin. +-# Example: +-# connection = mysql://root:pass@127.0.0.1:3306/quantum ++# Example: connection = mysql://root:pass@127.0.0.1:3306/quantum # Replace 127.0.0.1 above with the IP address of the database used by the # main quantum server. (Leave it as is if the database runs on this host.) -# connection = sqlite:// @@ -34,17 +39,6 @@ Last-Update: 2013-08-01 # slave_connection = --- neutron-2013.2~b2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +++ neutron-2013.2~b2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini -@@ -7,9 +7,9 @@ - # tenant networks to provide connectivity between hosts. Set to 'none' - # to disable creation of tenant networks. - # --# tenant_network_type = local - # Example: tenant_network_type = gre - # Example: tenant_network_type = vxlan -+tenant_network_type = local - - # (ListOpt) Comma-separated list of - # [::] tuples enumerating ranges @@ -30,22 +30,22 @@ # point setting tunnel_type below will be required to enable # tunneling. @@ -76,7 +70,7 @@ Last-Update: 2013-08-01 # this hypervisor. # -# local_ip = -+local_ip = 192.168.2.99 ++local_ip = 127.0.0.1 # (ListOpt) Comma-separated list of : tuples # mapping physical network names to the agent's node-specific OVS diff --git a/xenial/debian/patches/fix-setup.cfg-to-install-all.patch b/xenial/debian/patches/fix-setup.cfg-to-install-all.patch deleted file mode 100644 index c1ebb42e2..000000000 --- a/xenial/debian/patches/fix-setup.cfg-to-install-all.patch +++ /dev/null @@ -1,239 +0,0 @@ -Description: Origin setup.cfg misses many .py files in the python-neutron -Author: Thomas Goirand -Forwarded: no -Last-Update: 2013-07-31 - ---- 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/xenial/debian/patches/series b/xenial/debian/patches/series index 03bdf846e..385c8b781 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1,2 +1 @@ -fix-setup.cfg-to-install-all.patch better-config-default.patch