From 4fe843d61f272b242f2730d5dbae42121d88c819 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 7 Sep 2015 11:58:42 +0200 Subject: [PATCH] Rebased better-config-defaults.patch Rewritten-From: 99a9bdb832f53c57b39cb5cc48b891f9d893e7f7 --- trusty/debian/changelog | 1 + .../patches/better-config-defaults.patch | 145 ++++++++---------- 2 files changed, 68 insertions(+), 78 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 211c73e98..939e2f671 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -2,6 +2,7 @@ neutron (7.0.0~b3-1) experimental; urgency=medium * New upstream release. * Fixed (build-)depends for this release. + * Rebased better-config-defaults.patch. -- Thomas Goirand Mon, 07 Sep 2015 11:51:13 +0200 diff --git a/trusty/debian/patches/better-config-defaults.patch b/trusty/debian/patches/better-config-defaults.patch index 7f5909f8f..68337a4cb 100644 --- a/trusty/debian/patches/better-config-defaults.patch +++ b/trusty/debian/patches/better-config-defaults.patch @@ -3,12 +3,10 @@ Description: Better config defaults minimize the efforts needed to be done by newbies. Author: Thomas Goirand Forwarded: not-needed -Last-Update: 2015-07-31 +Last-Update: 2015-09-07 -diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini -index 0f56260..7704ec6 100644 ---- a/etc/dhcp_agent.ini -+++ b/etc/dhcp_agent.ini +--- neutron-7.0.0~b3.orig/etc/dhcp_agent.ini ++++ neutron-7.0.0~b3/etc/dhcp_agent.ini @@ -9,14 +9,13 @@ # The DHCP agent requires an interface driver be set. Choose the one that best @@ -26,7 +24,7 @@ index 0f56260..7704ec6 100644 # Use veth for an OVS interface or not. # Support kernels with limited namespace support -@@ -28,20 +27,20 @@ +@@ -28,13 +27,13 @@ # The agent can use other DHCP drivers. Dnsmasq is the simplest and requires # no additional setup of the DHCP server. @@ -36,21 +34,23 @@ index 0f56260..7704ec6 100644 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and # iproute2 package that supports namespaces). This option is deprecated and # will be removed in a future release, at which point the old behavior of - # use_namespaces = True will be enforced. +-# use_namespaces = True will be enforced. -# use_namespaces = True ++# the use_namespaces = True will be enforced. +use_namespaces = True - # The DHCP server can assist with providing metadata support on isolated - # networks. Setting this value to True will cause the DHCP server to append - # specific host routes to the DHCP request. The metadata service will only + # In some cases the neutron router is not present to provide the metadata + # IP but the DHCP server can be used to provide this info. Setting this +@@ -49,7 +48,7 @@ # be activated when the subnet does not contain any router port. The guest # instance must be configured to request host routes via DHCP (Option 121). + # This option doesn't have any effect when force_metadata is set to True. -# enable_isolated_metadata = False +enable_isolated_metadata = False # Allows for serving metadata requests coming from a dedicated metadata # access network whose cidr is 169.254.169.254/16 (or larger prefix), and -@@ -62,7 +61,7 @@ +@@ -71,7 +70,7 @@ # dhcp_domain = openstacklocal # Override the default dnsmasq settings with this file @@ -59,10 +59,8 @@ index 0f56260..7704ec6 100644 # Comma-separated list of DNS servers which will be used by dnsmasq # as forwarders. -diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini -index 310b6b5..478d0db 100644 ---- a/etc/l3_agent.ini -+++ b/etc/l3_agent.ini +--- neutron-7.0.0~b3.orig/etc/l3_agent.ini ++++ neutron-7.0.0~b3/etc/l3_agent.ini @@ -4,11 +4,10 @@ # L3 requires that an interface driver be set. Choose the one that best @@ -89,7 +87,7 @@ index 310b6b5..478d0db 100644 # If use_namespaces is set as False then the agent can only configure one router. -@@ -54,12 +53,12 @@ +@@ -59,12 +58,12 @@ # an external network gateway configured. This option should be True only # for a single agent in a Neutron deployment, and may be False for all agents # if all routers must have an external network gateway @@ -104,7 +102,7 @@ index 310b6b5..478d0db 100644 # TCP Port used by Neutron metadata server # metadata_port = 9697 -@@ -77,7 +76,7 @@ +@@ -82,7 +81,7 @@ # enable_metadata_proxy, which is true by default, can be set to False # if the Nova metadata server is not available @@ -113,7 +111,7 @@ index 310b6b5..478d0db 100644 # Iptables mangle mark used to mark metadata valid requests # metadata_access_mark = 0x1 -@@ -94,7 +93,7 @@ +@@ -99,7 +98,7 @@ # This should not be a problem any more. Refer to bug: # https://bugs.launchpad.net/neutron/+bug/1418079 # This option is deprecated and will be removed in the M release @@ -122,7 +120,7 @@ index 310b6b5..478d0db 100644 # Timeout for ovs-vsctl commands. # If the timeout expires, ovs commands will fail with ALARMCLOCK error. -@@ -109,7 +108,7 @@ +@@ -114,7 +113,7 @@ # - dvr_snat: this enables centralized SNAT support in conjunction with # DVR. This mode must be used for an L3 agent running on a centralized # node (or in single-host deployments, e.g. devstack). @@ -131,7 +129,7 @@ index 310b6b5..478d0db 100644 # Location to store keepalived and all HA configurations # ha_confs_path = $state_path/ha_confs -@@ -123,6 +122,8 @@ +@@ -128,6 +127,8 @@ # The advertisement interval in seconds # ha_vrrp_advert_int = 2 @@ -140,10 +138,8 @@ index 310b6b5..478d0db 100644 [AGENT] # Log agent heartbeats from this L3 agent # log_agent_heartbeats = False -diff --git a/etc/metadata_agent.ini b/etc/metadata_agent.ini -index e436069..a897691 100644 ---- a/etc/metadata_agent.ini -+++ b/etc/metadata_agent.ini +--- neutron-7.0.0~b3.orig/etc/metadata_agent.ini ++++ neutron-7.0.0~b3/etc/metadata_agent.ini @@ -23,7 +23,7 @@ admin_password = %SERVICE_PASSWORD% # nova_metadata_port = 8775 @@ -153,10 +149,8 @@ index e436069..a897691 100644 # Whether insecure SSL connection should be accepted for Nova metadata server # requests -diff --git a/etc/neutron.conf b/etc/neutron.conf -index f5a6da6..ec21eb6 100755 ---- a/etc/neutron.conf -+++ b/etc/neutron.conf +--- neutron-7.0.0~b3.orig/etc/neutron.conf ++++ neutron-7.0.0~b3/etc/neutron.conf @@ -57,8 +57,8 @@ # previous versions, the class name of a plugin can be specified instead of its # entrypoint name. @@ -172,7 +166,7 @@ index f5a6da6..ec21eb6 100755 # of its entrypoint name. # -# service_plugins = - # Example: service_plugins = router,firewall,lbaas,vpnaas,metering + # Example: service_plugins = router,firewall,lbaas,vpnaas,metering,qos +service_plugins = router,metering # Paste configuration file @@ -186,7 +180,7 @@ index f5a6da6..ec21eb6 100755 # Base MAC address. The first 3 octets will remain unchanged. If the # 4h octet is not 00, it will also be used. The others will be -@@ -126,7 +126,8 @@ +@@ -129,7 +129,8 @@ # Enable or disable overlapping IPs for subnets # Attention: the following parameter MUST be set to False if Neutron is # being used in conjunction with nova security groups @@ -196,7 +190,7 @@ index f5a6da6..ec21eb6 100755 # Ensure that configured gateway is on subnet. For IPv6, validate only if # gateway is not a link local address. Deprecated, to be removed during the # K release, at which point the check will be mandatory. -@@ -344,20 +345,20 @@ +@@ -363,20 +364,20 @@ # ======== neutron nova interactions ========== # Send notification to nova when port status is active. @@ -221,7 +215,7 @@ index f5a6da6..ec21eb6 100755 # The uuid of the admin nova tenant # nova_admin_tenant_id = -@@ -456,7 +457,7 @@ +@@ -475,7 +476,7 @@ # The RabbitMQ broker address where a single node is used. # (string value) @@ -230,7 +224,7 @@ index f5a6da6..ec21eb6 100755 # The RabbitMQ broker port where a single node is used. # (integer value) -@@ -469,10 +470,10 @@ +@@ -488,10 +489,10 @@ # rabbit_use_ssl=false # The RabbitMQ userid. (string value) @@ -243,7 +237,7 @@ index f5a6da6..ec21eb6 100755 # the RabbitMQ login method (string value) # rabbit_login_method=AMQPLAIN -@@ -557,7 +558,7 @@ +@@ -576,7 +577,7 @@ # The messaging driver to use, defaults to rabbit. Other # drivers include qpid and zmq. (string value) @@ -252,7 +246,7 @@ index f5a6da6..ec21eb6 100755 # The default exchange under which topics are scoped. May be # overridden by an exchange name specified in the -@@ -670,7 +671,7 @@ +@@ -689,7 +690,7 @@ # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the command directly @@ -261,7 +255,7 @@ index f5a6da6..ec21eb6 100755 # Set to true to add comments to generated iptables rules that describe # each rule's purpose. (System must support the iptables comments module.) -@@ -709,15 +710,14 @@ admin_password = %SERVICE_PASSWORD% +@@ -728,15 +729,14 @@ admin_password = %SERVICE_PASSWORD% [database] # This line MUST be changed to actually run the plugin. @@ -279,16 +273,14 @@ index f5a6da6..ec21eb6 100755 # Database engine for which script will be generated when using offline # migration -diff --git a/etc/neutron/plugins/ml2/ml2_conf.ini b/etc/neutron/plugins/ml2/ml2_conf.ini -index 9aad25b..e4e1cb9 100644 ---- a/etc/neutron/plugins/ml2/ml2_conf.ini -+++ b/etc/neutron/plugins/ml2/ml2_conf.ini -@@ -2,24 +2,24 @@ +--- neutron-7.0.0~b3.orig/etc/neutron/plugins/ml2/ml2_conf.ini ++++ neutron-7.0.0~b3/etc/neutron/plugins/ml2/ml2_conf.ini +@@ -2,25 +2,25 @@ # (ListOpt) List of network type driver entrypoints to be loaded from # the neutron.ml2.type_drivers namespace. # --# type_drivers = local,flat,vlan,gre,vxlan - # Example: type_drivers = flat,vlan,gre,vxlan +-# type_drivers = local,flat,vlan,gre,vxlan,geneve + # Example: type_drivers = flat,vlan,gre,vxlan,geneve +type_drivers = flat,gre # (ListOpt) Ordered list of network_types to allocate as tenant @@ -296,9 +288,10 @@ index 9aad25b..e4e1cb9 100644 # but provides no connectivity between hosts. # -# tenant_network_types = local - # Example: tenant_network_types = vlan,gre,vxlan + # Example: tenant_network_types = vlan,gre,vxlan,geneve +tenant_network_types = gre + # (ListOpt) Ordered list of networking mechanism driver entrypoints # to be loaded from the neutron.ml2.mechanism_drivers namespace. -# mechanism_drivers = @@ -311,7 +304,7 @@ index 9aad25b..e4e1cb9 100644 # (ListOpt) Ordered list of extension driver entrypoints # to be loaded from the neutron.ml2.extension_drivers namespace. -@@ -63,9 +63,9 @@ +@@ -64,9 +64,9 @@ # can be created. Use * to allow flat networks with arbitrary # physical_network names. # @@ -322,7 +315,7 @@ index 9aad25b..e4e1cb9 100644 [ml2_type_vlan] # (ListOpt) List of [::] tuples -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ [ml2_type_gre] # (ListOpt) Comma-separated list of : tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation @@ -331,7 +324,7 @@ index 9aad25b..e4e1cb9 100644 [ml2_type_vxlan] # (ListOpt) Comma-separated list of : tuples enumerating -@@ -96,8 +96,8 @@ +@@ -113,8 +113,8 @@ [securitygroup] # Controls if neutron security group is enabled or not. # It should be false when you use nova security group. @@ -342,32 +335,8 @@ index 9aad25b..e4e1cb9 100644 # requires that ipset is installed on L2 agent node. -# enable_ipset = True +enable_ipset = True -diff --git a/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini b/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini -index 7f91d74..13a781d 100644 ---- a/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini -+++ b/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini -@@ -45,14 +45,13 @@ - # local_ip = - - # OVS integration bridge. --# integration_bridge = br-int -+integration_bridge = br-int - - # Provide bridge mappings for VLAN networks. --# bridge_mappings = - # --# Example: --# bridge_mappings = physnet1:br-eth1 -+# Example: bridge_mappings = physnet1:br-eth1 - # where eth1 is data interface. -+bridge_mappings = external:br-ex - - # Firewall driver for OVSvApp. - # firewall_driver = networking_vsphere.drivers.ovs_firewall.OVSFirewallDriver -diff --git a/etc/neutron/plugins/ml2/openvswitch_agent.ini b/etc/neutron/plugins/ml2/openvswitch_agent.ini -index 5dd11a8..12e3a0a 100644 ---- a/etc/neutron/plugins/ml2/openvswitch_agent.ini -+++ b/etc/neutron/plugins/ml2/openvswitch_agent.ini +--- neutron-7.0.0~b3.orig/etc/neutron/plugins/ml2/openvswitch_agent.ini ++++ neutron-7.0.0~b3/etc/neutron/plugins/ml2/openvswitch_agent.ini @@ -5,7 +5,7 @@ # attached to this bridge and then "patched" according to their network # connectivity. @@ -387,7 +356,7 @@ index 5dd11a8..12e3a0a 100644 # (BoolOpt) Use veths instead of patch ports to interconnect the integration # bridge to physical networks. Support kernel without ovs patch port support -@@ -62,7 +62,7 @@ +@@ -67,7 +67,7 @@ # log_agent_heartbeats = False # Agent's polling interval in seconds @@ -396,7 +365,7 @@ index 5dd11a8..12e3a0a 100644 # Minimize polling by monitoring ovsdb for interface changes # minimize_polling = True -@@ -77,10 +77,10 @@ +@@ -82,10 +82,10 @@ # disable tunneling support in the agent. # You can specify as many values here as your compute hosts supports. # @@ -408,7 +377,7 @@ index 5dd11a8..12e3a0a 100644 # (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By # default, this will make use of the Open vSwitch default value of '4789' if -@@ -102,12 +102,12 @@ +@@ -107,12 +107,12 @@ # RPC calbbacks instead of tunnel_sync/update) on OVS agents in order to # optimize tunnel management. # @@ -423,7 +392,7 @@ index 5dd11a8..12e3a0a 100644 # Enable suppression of ARP responses that don't match an IP address that # belongs to the port from which they originate. -@@ -126,7 +126,7 @@ +@@ -131,7 +131,7 @@ # (BoolOpt) Set to True on L2 agents to enable support # for distributed virtual routing. # @@ -432,7 +401,7 @@ index 5dd11a8..12e3a0a 100644 # (IntOpt) Set new timeout in seconds for new rpc calls after agent receives # SIGTERM. If value is set to 0, rpc timeout won't be changed" -@@ -137,30 +137,8 @@ +@@ -147,30 +147,8 @@ # Firewall driver for realizing neutron security group function. # firewall_driver = neutron.agent.firewall.NoopFirewallDriver # Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver @@ -465,3 +434,23 @@ index 5dd11a8..12e3a0a 100644 -# [agent] -# tunnel_types = vxlan +enable_security_group = True +--- neutron-7.0.0~b3.orig/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini ++++ neutron-7.0.0~b3/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini +@@ -45,14 +45,13 @@ + # local_ip = + + # OVS integration bridge. +-# integration_bridge = br-int ++integration_bridge = br-int + + # Provide bridge mappings for VLAN networks. +-# bridge_mappings = + # +-# Example: +-# bridge_mappings = physnet1:br-eth1 ++# Example: bridge_mappings = physnet1:br-eth1 + # where eth1 is data interface. ++bridge_mappings = external:br-ex + + # Firewall driver for OVSvApp. + # firewall_driver = networking_vsphere.drivers.ovs_firewall.OVSFirewallDriver -- 2.45.2