From: Dmitry Burmistrov Date: Mon, 23 Jun 2014 17:18:41 +0000 (+0400) Subject: Update DEB specs to v. 2014.1.1 X-Git-Tag: openstack-ci/fuel/2014.1.1/5.1~1 X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=commitdiff_plain;h=250e667b5214a5512d74364a33bdb708003e94a3 Update DEB specs to v. 2014.1.1 --- diff --git a/debian/changelog b/debian/changelog index f4a06cb72..941a16219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,89 @@ -neutron (1:2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium +neutron (1:2014.1.1-0ubuntu1) trusty; urgency=medium + + * Resynchronize with stable/icehouse (54ac82b) (LP: #1328134): + - [2b42dd3] Handle errors from run_ofctl() when dumping flows + - [d00446b] Reprogram flows when ovs-vswitchd restarts + - [8d3026b] Added missing plugin .ini files to setup.cfg + - [072bbc0] NEC plugin: Bump L3RPC callback version to 1.1 + - [47a4954] Remove List events API from Cisco N1kv Neutron + - [28a26db] Install SNAT rules for ipv4 only + - [5bdea2d] Use os.uname() instead of calling uname in subprocess + - [48bc7db] Replace loopingcall in notifier with a delayed send + - [66eeda2] Explicitly import state_path opt in tests.base + - [f1b0607] NSX: allow net-migration only in combined mode + - [8abb05c] NSX: do not raise on missing router during migration step + - [4c945dd] NSX: fix error when creating VM ports on subnets without dhcp + - [efa4f28] OVS lib defer apply doesn't handle concurrency + - [bc30b52] NSX: ensure that no LSN is created on external networks + - [2bcc7bf] NSX: pass the right argument during metadata setup + - [26a591a] Big Switch: Check source_address attribute exists + - [74a9365] L3 RPC loop could delete a router on concurrent update + - [2a7164a] Optimize querying for security groups + - [bac4389] set api.extensions logging to ERROR in unit tests + - [d1ab56d] Make default nova_url use a version + - [2c56e14] NSX: fix API payloads for dhcp/metadata setup + - [f217479] NSX: fix migration for networks without a subnet + - [bf281cd] NSX: change api mapping for Service Cluster to Edge Cluster + - [7225e2b] NSX: add nsx switch lookup to dhcp and metadata operations + - [b922aa7] Fixed floating IP logic in PLUMgrid plugin + - [84650f8] IBM: set secret=True on passwd config field + - [c5040b4] Update ensure()/reconnect() to catch MessagingError + - [e0deffc] NSX: Fix fake_api_client to raise NotFound + - [42a8539] netaddr<=0.7.10 raises ValueError instead of AddrFormatError + - [68a24e5] Validate CIDR given as ip-prefix in security-group-rule-create + - [8991aa6] gw_port should be set as lazy='join' + - [54ac82b] NSX: ensure dhcp port is setup on metadata network + + -- Corey Bryant Mon, 09 Jun 2014 16:18:49 -0400 + +neutron (1:2014.1-0ubuntu1) trusty; urgency=medium - * New update for the Ubuntu Cloud Archive. + [ Chuck Short ] + * New upstream release (LP: #1288245). + + -- James Page Thu, 17 Apr 2014 13:04:17 +0100 + +neutron (1:2014.1~rc2-0ubuntu4) trusty; urgency=medium + + * d/neutron-vpn-agent.upstart: Wait for neutron-ovs-cleanup service to + start if installed to ensure that Open vSwitch state is cleaned up + on reboot (LP: #1307208). + + -- James Page Mon, 14 Apr 2014 11:07:44 +0100 + +neutron (1:2014.1~rc2-0ubuntu3) trusty; urgency=medium + + * Fix the Breaks/Replaces from the previous version, as they were + accidentally added to the wrong package (and with the wrong versioning). + + -- Steve Langasek Thu, 10 Apr 2014 23:36:09 +0000 + +neutron (1:2014.1~rc2-0ubuntu2) trusty; urgency=medium + + * Ensure that VPN and L3 agents are not installed together (LP: #1303876): + - d/control: Add Conflicts on neutron-l3-agent to neutron-vpn-agent, + drop dependency from neutron-vpn-agent -> neutron-l3-agent. + - d/neutron-{common,vpn-agent,l3-agent}.install: Move configuration and + rootwrap filters to -common package for use by both agent types. + - d/control: Add appropriate Breaks/Replaces for config file moves. + - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file + path inline with l3-agent configuration. + - d/control: Align Depends of neutron-vpn-agent with neutron-l3-agent. + + -- James Page Thu, 10 Apr 2014 14:34:18 +0100 + +neutron (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium + + [ James Page ] + * d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart + configuration to match package name (LP: #1301957). + * d/neutron-vpn-agent.install: Install missing vpnaas.filters for + rootwrap (LP: #1303876). + + [ Chuck Short ] + * New upstream release candidate (LP: #1288245). - -- Openstack Ubuntu Testing Bot Wed, 02 Apr 2014 00:27:41 -0400 + -- Chuck Short Wed, 09 Apr 2014 08:51:40 -0400 neutron (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium diff --git a/debian/control b/debian/control index ce201112e..33b108e7c 100644 --- a/debian/control +++ b/debian/control @@ -60,8 +60,8 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) +Breaks: quantum-server (<< 1:2013.2~b2-0ubuntu1~) +Replaces: quantum-server (<< 1:2013.2~b2-0ubuntu1~) Recommends: neutron-plugin-ml2 Description: Neutron is a virtual network service for Openstack - server Neutron is a virtual network service for Openstack, and a part of @@ -82,8 +82,14 @@ Depends: python-neutron (= ${source:Version}), ${misc:Depends}, ${python:Depends} -Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Breaks: + neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~), + neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~), + quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: + neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~), + neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~), + quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) Description: Neutron is a virtual network service for Openstack - common Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -677,13 +683,15 @@ Description: Neutron is a virtual network service for Openstack - Mellanox plugi Package: neutron-vpn-agent Architecture: all Depends: + iputils-arping, neutron-common (= ${source:Version}), - neutron-l3-agent (= ${source:Version}), + neutron-metadata-agent (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Conflicts: neutron-l3-agent Description: Neutron is a virtual network service for Openstack - VPN agent Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -694,7 +702,7 @@ Description: Neutron is a virtual network service for Openstack - VPN agent advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the VPN agent. + This package provides the VPN agent, which also provides L3 agent support. Package: neutron-plugin-vpn-agent Architecture: all @@ -825,4 +833,3 @@ Description: Neutron is a virtual network service for Openstack - One Convergenc etc.) . This package provides the One Convergence agent. - diff --git a/debian/neutron-common.install b/debian/neutron-common.install index 37e2b4033..dfd842cc6 100644 --- a/debian/neutron-common.install +++ b/debian/neutron-common.install @@ -1,10 +1,16 @@ +debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d debian/neutron_sudoers etc/sudoers.d etc/api-paste.ini etc/neutron +etc/fwaas_driver.ini etc/neutron +etc/l3_agent.ini etc/neutron etc/neutron.conf etc/neutron etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d +etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d +etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d etc/policy.json etc/neutron etc/rootwrap.conf etc/neutron +etc/vpn_agent.ini etc/neutron usr/bin/neutron-db-manage usr/bin usr/bin/neutron-debug usr/bin usr/bin/neutron-netns-cleanup usr/bin diff --git a/debian/neutron-l3-agent.install b/debian/neutron-l3-agent.install index 0e8f72407..af232bf4c 100644 --- a/debian/neutron-l3-agent.install +++ b/debian/neutron-l3-agent.install @@ -1,5 +1 @@ -debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d -etc/l3_agent.ini etc/neutron -etc/fwaas_driver.ini etc/neutron -etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d usr/bin/neutron-l3-agent usr/bin diff --git a/debian/neutron-plugin-onecovergence-agent.upstart b/debian/neutron-plugin-oneconvergence-agent.upstart similarity index 100% rename from debian/neutron-plugin-onecovergence-agent.upstart rename to debian/neutron-plugin-oneconvergence-agent.upstart diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart index 2ca4ecec5..27fcfcf42 100644 --- a/debian/neutron-plugin-openvswitch-agent.upstart +++ b/debian/neutron-plugin-openvswitch-agent.upstart @@ -14,4 +14,4 @@ pre-start script chown neutron:root /var/run/neutron end script -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log diff --git a/debian/neutron-vpn-agent.install b/debian/neutron-vpn-agent.install index 9016e710f..8217b7501 100644 --- a/debian/neutron-vpn-agent.install +++ b/debian/neutron-vpn-agent.install @@ -1,2 +1 @@ -etc/vpn_agent.ini etc/neutron usr/bin/neutron-vpn-agent usr/bin diff --git a/debian/neutron-vpn-agent.upstart b/debian/neutron-vpn-agent.upstart index 901875fee..bf983dc13 100644 --- a/debian/neutron-vpn-agent.upstart +++ b/debian/neutron-vpn-agent.upstart @@ -12,8 +12,14 @@ chdir /var/run pre-start script mkdir -p /var/run/neutron chown neutron:root /var/run/neutron + # Check to see if openvswitch plugin in use by checking + # status of cleanup upstart configuration + if status neutron-ovs-cleanup; then + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent + fi end script exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \ - --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log + --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \ + --log-file=/var/log/neutron/vpn_agent.log