-Description: Better config default
- The default of Neutron make it so that it's not usable by default, and hard to
- parse with maintainer scripts. This patch fixes that.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-06-30
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ neutron (2014.2~b2-1) experimental; urgency=medium
+ .
+ [ Thomas Goirand ]
+ * Disabled ml2 config patch.
+ * Fixed (build-)depends for this release.
+ .
+ [ gustavo panizzo ]
+ * New upstream release.
+ * Support to run neutron under systemd.
+Author: gustavo panizzo <gfa@zumbi.com.ar>
---- a/etc/l3_agent.ini
-+++ b/etc/l3_agent.ini
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- neutron-2014.2~b2.orig/etc/l3_agent.ini
++++ neutron-2014.2~b2/etc/l3_agent.ini
@@ -4,11 +4,10 @@
# L3 requires that an interface driver be set. Choose the one that best
# Use veth for an OVS interface or not.
# Support kernels with limited namespace support
---- a/etc/neutron.conf
-+++ b/etc/neutron.conf
-@@ -50,8 +50,7 @@
+--- neutron-2014.2~b2.orig/etc/neutron.conf
++++ neutron-2014.2~b2/etc/neutron.conf
+@@ -60,8 +60,8 @@ lock_path = $state_path/lock
# previous versions, the class name of a plugin can be specified instead of its
# entrypoint name.
#
-# core_plugin =
--# Example: core_plugin = ml2
+ # Example: core_plugin = ml2
+core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
# (ListOpt) List of service plugin entrypoints to be loaded from the
# neutron.service_plugins namespace. See setup.cfg for the entrypoint names of
-@@ -59,8 +58,8 @@
+@@ -69,8 +69,8 @@ lock_path = $state_path/lock
# with previous versions, the class name of a plugin can be specified instead
# of its entrypoint name.
#
# Paste configuration file
# api_paste_config = api-paste.ini
-@@ -132,16 +131,16 @@
- # SSL certification authority file (valid only if SSL enabled)
- # kombu_ssl_ca_certs =
- # IP address of the RabbitMQ installation
--# rabbit_host = localhost
-+rabbit_host = localhost
- # Password of the RabbitMQ server
--# rabbit_password = guest
-+rabbit_password = guest
- # Port where RabbitMQ server is running/listening
- # rabbit_port = 5672
- # RabbitMQ single or HA cluster (host:port pairs i.e: host1:5672, host2:5672)
- # rabbit_hosts is defaulted to '$rabbit_host:$rabbit_port'
- # rabbit_hosts = localhost:5672
- # User ID used for RabbitMQ connections
--# rabbit_userid = guest
-+rabbit_userid = guest
- # Location of a virtual RabbitMQ installation.
- # rabbit_virtual_host = /
- # Maximum retries with trying to connect to RabbitMQ
-@@ -389,7 +388,7 @@
+@@ -315,7 +315,7 @@ lock_path = $state_path/lock
+
+ # The RabbitMQ broker address where a single node is used.
+ # (string value)
+-#rabbit_host=localhost
++rabbit_host=localhost
+
+ # The RabbitMQ broker port where a single node is used.
+ # (integer value)
+@@ -328,10 +328,10 @@ lock_path = $state_path/lock
+ #rabbit_use_ssl=false
+
+ # The RabbitMQ userid. (string value)
+-#rabbit_userid=guest
++rabbit_userid=guest
+
+ # The RabbitMQ password. (string value)
+-#rabbit_password=guest
++rabbit_password=guest
+
+ # the RabbitMQ login method (string value)
+ #rabbit_login_method=AMQPLAIN
+@@ -507,7 +507,7 @@ lock_path = $state_path/lock
# 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 comand directly
# =========== items for agent management extension =============
# seconds between nodes reporting state to server; should be less than
-@@ -408,11 +407,9 @@
-
+@@ -527,14 +527,13 @@ admin_password = %SERVICE_PASSWORD%
[database]
# This line MUST be changed to actually run the plugin.
--# Example:
+ # Example:
-# connection = mysql://root:pass@127.0.0.1:3306/neutron
# Replace 127.0.0.1 above with the IP address of the database used by the
# main neutron server. (Leave it as is if the database runs on this host.)
-# connection = sqlite://
+ # NOTE: In deployment the [database] section and its connection attribute may
+ # be set in the corresponding core plugin '.ini' file. However, it is suggested
+ # to put the [database] section and its connection attribute in this
+ # configuration file.
+connection = sqlite:///var/lib/neutron/neutrondb
# Database engine for which script will be generated when using offline
# migration
---- a/etc/lbaas_agent.ini
-+++ b/etc/lbaas_agent.ini
+--- neutron-2014.2~b2.orig/etc/lbaas_agent.ini
++++ neutron-2014.2~b2/etc/lbaas_agent.ini
@@ -9,11 +9,10 @@
# LBaas requires an interface driver be set. Choose the one that best
# Use veth for an OVS interface or not.
# Support kernels with limited namespace support
---- a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-+++ b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+--- neutron-2014.2~b2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
++++ neutron-2014.2~b2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -30,22 +30,22 @@
# point setting tunnel_type below will be required to enable
# tunneling.
# (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
# mapping physical network names to the agent's node-specific OVS
-@@ -140,40 +140,10 @@
+@@ -151,40 +151,10 @@
[securitygroup]
# Firewall driver for realizing neutron security group function.
Bug-Debian: http://bugs.debian.org/726719
Bug-Ubuntu: https://launchpad.net/bugs/1241952
Forwarded: https://review.openstack.org/#/c/52636
-Last-Update: 2014-06-30
+Last-Update: 2014-07-31
---- a/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
-+++ b/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
-@@ -59,9 +59,9 @@
- return
-
- op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
-- nullable=False, default=True))
-+ nullable=False, server_default='1'))
- # Set enable_snat to True for existing routers
-- op.execute("UPDATE routers SET enable_snat=True")
-+ op.execute("UPDATE routers SET enable_snat='True'")
-
-
- def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
-+++ b/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
-@@ -46,11 +46,27 @@
- if not migration.should_run(active_plugins, migration_for_plugins):
- return
-
-- op.create_unique_constraint(
-- name=CONSTRAINT_NAME,
-- source=TABLE_NAME,
-- local_cols=['id']
-- )
-+ bind = op.get_bind()
-+ engine = bind.engine
-+ if engine.name == 'sqlite':
-+ op.execute("CREATE TEMPORARY TABLE ovs_tunnel_endpoints_backup ( "
-+ "ip_address VARCHAR(64) NOT NULL, "
-+ "id INTEGER NOT NULL UNIQUE, "
-+ "PRIMARY KEY (ip_address) );")
-+ op.execute("INSERT INTO ovs_tunnel_endpoints_backup SELECT ip_address,id FROM ovs_tunnel_endpoints;")
-+ op.execute("DROP TABLE ovs_tunnel_endpoints;");
-+ op.execute("CREATE TABLE ovs_tunnel_endpoints ( "
-+ "ip_address VARCHAR(64) NOT NULL, "
-+ "id INTEGER UNIQUE NOT NULL, "
-+ "PRIMARY KEY (ip_address) );")
-+ op.execute("INSERT INTO ovs_tunnel_endpoints SELECT ip_address,id FROM ovs_tunnel_endpoints_backup;")
-+ op.execute("DROP TABLE ovs_tunnel_endpoints_backup;")
-+ else:
-+ op.create_unique_constraint(
-+ name=CONSTRAINT_NAME,
-+ source=TABLE_NAME,
-+ local_cols=['id']
-+ )
-
-
- def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
-+++ b/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
-@@ -38,7 +38,42 @@
-
-
- def upgrade(active_plugins=None, options=None):
-- op.drop_column('ipallocations', u'expiration')
-+ bind = op.get_bind()
-+ engine = bind.engine
-+ if engine.name == 'sqlite':
-+ op.execute("CREATE TEMPORARY TABLE ipallocations_backup ("
-+ "port_id VARCHAR(36), "
-+ "ip_address VARCHAR(64) NOT NULL, "
-+ "subnet_id VARCHAR(36) NOT NULL, "
-+ "network_id VARCHAR(36) NOT NULL, "
-+ "PRIMARY KEY (ip_address, subnet_id, network_id), "
-+ "FOREIGN KEY(network_id) REFERENCES networks (id) "
-+ "ON DELETE CASCADE, "
-+ "FOREIGN KEY(port_id) REFERENCES ports (id) "
-+ "ON DELETE CASCADE, "
-+ "FOREIGN KEY(subnet_id) REFERENCES subnets (id) "
-+ "ON DELETE CASCADE "
-+ ");")
-+ op.execute("INSERT INTO ipallocations_backup "
-+ "SELECT port_id,ip_address,subnet_id,network_id "
-+ "FROM ipallocations;")
-+ op.execute("DROP TABLE ipallocations;")
-+ op.execute("CREATE TABLE ipallocations ("
-+ "port_id VARCHAR(36), "
-+ "ip_address VARCHAR(64) NOT NULL, "
-+ "subnet_id VARCHAR(36) NOT NULL, "
-+ "network_id VARCHAR(36) NOT NULL, "
-+ "PRIMARY KEY (ip_address, subnet_id, network_id), "
-+ "FOREIGN KEY(network_id) REFERENCES networks (id) ON DELETE CASCADE, "
-+ "FOREIGN KEY(port_id) REFERENCES ports (id) ON DELETE CASCADE, "
-+ "FOREIGN KEY(subnet_id) REFERENCES subnets (id) ON DELETE CASCADE "
-+ ");")
-+ op.execute("INSERT INTO ipallocations "
-+ "SELECT port_id,ip_address,subnet_id,network_id "
-+ "FROM ipallocations_backup;")
-+ op.execute("DROP TABLE ipallocations_backup;")
-+ else:
-+ op.drop_column('ipallocations', u'expiration')
-
-
- def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
-+++ b/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
-@@ -43,8 +43,48 @@
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
+@@ -41,8 +41,48 @@ from neutron.db import migration
def upgrade(active_plugins=None, options=None):
if not migration.should_run(active_plugins, migration_for_plugins):
return
def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
-+++ b/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
-@@ -55,19 +55,63 @@
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
+@@ -53,19 +53,63 @@ def upgrade(active_plugins=None, options
"UPDATE ml2_port_bindings SET"
" vif_details = '{\"port_filter\": false}'"
" WHERE cap_port_filter = 0")
def downgrade(active_plugins=None, options=None):
if not migration.should_run(active_plugins, migration_for_plugins):
---- a/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
-+++ b/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
-@@ -47,11 +47,17 @@
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
+@@ -59,7 +59,7 @@ def upgrade(active_plugins=None, options
+ op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
+ nullable=False, server_default="1"))
+ # Set enable_snat to True for existing routers
+- op.execute("UPDATE routers SET enable_snat=True")
++ op.execute("UPDATE routers SET enable_snat='True'")
+
+
+ def downgrade(active_plugins=None, options=None):
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
+@@ -44,11 +44,27 @@ def upgrade(active_plugins=None, options
+ if not migration.should_run(active_plugins, migration_for_plugins):
+ return
+
+- op.create_unique_constraint(
+- name=CONSTRAINT_NAME,
+- source=TABLE_NAME,
+- local_cols=['id']
+- )
++ bind = op.get_bind()
++ engine = bind.engine
++ if engine.name == 'sqlite':
++ op.execute("CREATE TEMPORARY TABLE ovs_tunnel_endpoints_backup ( "
++ "ip_address VARCHAR(64) NOT NULL, "
++ "id INTEGER NOT NULL UNIQUE, "
++ "PRIMARY KEY (ip_address) );")
++ op.execute("INSERT INTO ovs_tunnel_endpoints_backup SELECT ip_address,id FROM ovs_tunnel_endpoints;")
++ op.execute("DROP TABLE ovs_tunnel_endpoints;");
++ op.execute("CREATE TABLE ovs_tunnel_endpoints ( "
++ "ip_address VARCHAR(64) NOT NULL, "
++ "id INTEGER UNIQUE NOT NULL, "
++ "PRIMARY KEY (ip_address) );")
++ op.execute("INSERT INTO ovs_tunnel_endpoints SELECT ip_address,id FROM ovs_tunnel_endpoints_backup;")
++ op.execute("DROP TABLE ovs_tunnel_endpoints_backup;")
++ else:
++ op.create_unique_constraint(
++ name=CONSTRAINT_NAME,
++ source=TABLE_NAME,
++ local_cols=['id']
++ )
+
+
+ def downgrade(active_plugins=None, options=None):
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
+@@ -45,11 +45,17 @@ def upgrade(active_plugins=None, options
if not migration.should_run(active_plugins, migration_for_plugins):
return
def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
-+++ b/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
-@@ -43,14 +43,19 @@
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
+@@ -41,14 +41,19 @@ def upgrade(active_plugins=None, options
if not migration.should_run(active_plugins, migration_for_plugins):
return
def downgrade(active_plugins=None, options=None):
---- a/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
-+++ b/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
-@@ -55,11 +55,17 @@
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
+@@ -53,11 +53,17 @@ def upgrade(active_plugins=None, options
if not migration.should_run(active_plugins, migration_for_plugins):
return
+ )
+ def downgrade(active_plugins=None, options=None):
+--- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
++++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
+@@ -36,7 +36,42 @@ import sqlalchemy as sa
+
+
+ def upgrade(active_plugins=None, options=None):
+- op.drop_column('ipallocations', u'expiration')
++ bind = op.get_bind()
++ engine = bind.engine
++ if engine.name == 'sqlite':
++ op.execute("CREATE TEMPORARY TABLE ipallocations_backup ("
++ "port_id VARCHAR(36), "
++ "ip_address VARCHAR(64) NOT NULL, "
++ "subnet_id VARCHAR(36) NOT NULL, "
++ "network_id VARCHAR(36) NOT NULL, "
++ "PRIMARY KEY (ip_address, subnet_id, network_id), "
++ "FOREIGN KEY(network_id) REFERENCES networks (id) "
++ "ON DELETE CASCADE, "
++ "FOREIGN KEY(port_id) REFERENCES ports (id) "
++ "ON DELETE CASCADE, "
++ "FOREIGN KEY(subnet_id) REFERENCES subnets (id) "
++ "ON DELETE CASCADE "
++ ");")
++ op.execute("INSERT INTO ipallocations_backup "
++ "SELECT port_id,ip_address,subnet_id,network_id "
++ "FROM ipallocations;")
++ op.execute("DROP TABLE ipallocations;")
++ op.execute("CREATE TABLE ipallocations ("
++ "port_id VARCHAR(36), "
++ "ip_address VARCHAR(64) NOT NULL, "
++ "subnet_id VARCHAR(36) NOT NULL, "
++ "network_id VARCHAR(36) NOT NULL, "
++ "PRIMARY KEY (ip_address, subnet_id, network_id), "
++ "FOREIGN KEY(network_id) REFERENCES networks (id) ON DELETE CASCADE, "
++ "FOREIGN KEY(port_id) REFERENCES ports (id) ON DELETE CASCADE, "
++ "FOREIGN KEY(subnet_id) REFERENCES subnets (id) ON DELETE CASCADE "
++ ");")
++ op.execute("INSERT INTO ipallocations "
++ "SELECT port_id,ip_address,subnet_id,network_id "
++ "FROM ipallocations_backup;")
++ op.execute("DROP TABLE ipallocations_backup;")
++ else:
++ op.drop_column('ipallocations', u'expiration')
+
+
def downgrade(active_plugins=None, options=None):
Code Review / openstack-build / neutron-build.git / commitdiff