Merge lp:~james-page/neutron/grizzly-metadata-agent-fixup into lp:~openstack-ubuntu-testing/neutron/grizzly

[James Page]

1) Refactor metadata agent into separate package to support use by l3 and dhcp agents.

2) Add NVP configuration checker binary to plugin-nicira

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-04 08:48:11 +0000
+++ debian/changelog	2013-03-08 10:50:26 +0000
@@ -20,6 +20,9 @@
     patch, fixed up linuxbridge path. 
   * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests
     that attempt to setup udev monitors.
+  * d/quantum-metadata-agent.*: Refactor metadata-agent into separate
+    package and add Depends from quantum-l3-agent and quantum-dhcp-agent.
+  * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary.
 
  -- Chuck Short <[e-mail]>  Tue, 26 Feb 2013 08:27:14 -0600
 

=== modified file 'debian/control'
--- debian/control	2013-03-03 22:59:19 +0000
+++ debian/control	2013-03-08 10:50:26 +0000
@@ -270,12 +270,15 @@
 Architecture: all
 Depends:
  quantum-common (= ${source:Version}),
+ quantum-metadata-agent (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
+Breaks:
+ quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
  quantum-server ( <= 2013.1~g2-0ubuntu1 )
-Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
+Replaces:
+ quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
  quantum-server ( <= 2013.1~g2-0ubuntu1 )
 Description: Quantum is a virtual network service for Openstack - l3 agent
  Quantum is a virtual network service for Openstack, and a part of
@@ -295,6 +298,7 @@
  dnsmasq-base,
  dnsmasq-utils,
  quantum-common (= ${source:Version}),
+ quantum-metadata-agent (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
@@ -312,6 +316,27 @@
  .
  This package provides the DHCP agent.
 
+Package: quantum-metadata-agent
+Architecture: all
+Depends:
+ quantum-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-l3-agent (<= 2013.1.g3-0ubuntu1)
+Replaces: quantum-l3-agent (<= 2013.1.g3-0ubuntu1)
+Description: Quantum is a virtual network service for Openstack - metadata agent
+ Quantum is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Quantum provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Quantum API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the metadata proxy agent.
+
 Package: quantum-lbaas-agent
 Architecture: all
 Depends:
@@ -524,4 +549,3 @@
  etc.)
  .
  This package provides the Midonet plugin.
-

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-03-04 08:48:11 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-03-08 10:50:26 +0000
@@ -10,7 +10,7 @@
                self).test_create_subnet_with_two_host_routes()
 --- a/quantum/tests/unit/test_db_plugin.py
 +++ b/quantum/tests/unit/test_db_plugin.py
-@@ -1392,6 +1392,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_
+@@ -1394,6 +1394,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_
                  self._delete('ports', port4['port']['id'])
  
      def test_range_allocation(self):
@@ -18,7 +18,7 @@
          with self.subnet(gateway_ip='10.0.0.3',
                           cidr='10.0.0.0/29') as subnet:
                  kwargs = {"fixed_ips":
-@@ -2291,6 +2292,7 @@ class TestNetworksV2(QuantumDbPluginV2Te
+@@ -2293,6 +2294,7 @@ class TestNetworksV2(QuantumDbPluginV2Te
  class TestSubnetsV2(QuantumDbPluginV2TestCase):
  
      def _test_create_subnet(self, network=None, expected=None, **kwargs):
@@ -26,7 +26,7 @@
          keys = kwargs.copy()
          keys.setdefault('cidr', '10.0.0.0/24')
          keys.setdefault('ip_version', 4)
-@@ -3278,6 +3280,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
+@@ -3280,6 +3282,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
                                   host_routes=host_routes)
  
      def test_create_subnet_with_two_host_routes(self):
@@ -34,7 +34,7 @@
          gateway_ip = '10.0.0.1'
          cidr = '10.0.0.0/24'
          allocation_pools = [{'start': '10.0.0.2',
-@@ -3382,6 +3385,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
+@@ -3384,6 +3387,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
              self.assertEqual(res.status_int, 400)
  
      def test_delete_subnet_with_dns(self):
@@ -44,7 +44,7 @@
          dns_nameservers = ['1.2.3.4']
 --- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
 +++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
-@@ -26,6 +26,7 @@ class TestLinuxBridge(testtools.TestCase
+@@ -29,6 +29,7 @@ class TestLinuxBridge(base.BaseTestCase)
  
      def setUp(self):
          super(TestLinuxBridge, self).setUp()

=== modified file 'debian/quantum-l3-agent.install'
--- debian/quantum-l3-agent.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-l3-agent.install	2013-03-08 10:50:26 +0000
@@ -1,7 +1,4 @@
 bin/quantum-l3-agent usr/bin
-bin/quantum-metadata-agent usr/bin
-bin/quantum-ns-metadata-proxy usr/bin
 debian/cron.d/quantum-l3-agent-netns-cleanup etc/cron.d
 etc/l3_agent.ini etc/quantum
-etc/metadata_agent.ini etc/quantum
 etc/quantum/rootwrap.d/l3.filters etc/quantum/rootwrap.d

=== renamed file 'debian/quantum-l3-agent.quantum-l3-agent.upstart' => 'debian/quantum-l3-agent.upstart'
=== modified file 'debian/quantum-lbaas-agent.install'
--- debian/quantum-lbaas-agent.install	2013-03-03 22:59:19 +0000
+++ debian/quantum-lbaas-agent.install	2013-03-08 10:50:26 +0000
@@ -1,4 +1,4 @@
 bin/quantum-lbaas-agent usr/bin
 debian/cron.d/quantum-lbaas-agent-netns-cleanup etc/cron.d
+etc/lbaas_agent.ini etc/quantum
 etc/quantum/rootwrap.d/lbaas-haproxy.filters etc/quantum/rootwrap.d
-etc/lbaas_agent.ini etc/quantum

=== added file 'debian/quantum-metadata-agent.install'
--- debian/quantum-metadata-agent.install	1970-01-01 00:00:00 +0000
+++ debian/quantum-metadata-agent.install	2013-03-08 10:50:26 +0000
@@ -0,0 +1,3 @@
+bin/quantum-metadata-agent usr/bin
+bin/quantum-ns-metadata-proxy usr/bin
+etc/metadata_agent.ini etc/quantum

=== added file 'debian/quantum-metadata-agent.logrotate'
--- debian/quantum-metadata-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/quantum-metadata-agent.logrotate	2013-03-08 10:50:26 +0000
@@ -0,0 +1,7 @@
+/var/log/quantum/metadata-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== renamed file 'debian/quantum-l3-agent.quantum-metadata-agent.upstart' => 'debian/quantum-metadata-agent.upstart'
=== modified file 'debian/quantum-plugin-nicira.install'
--- debian/quantum-plugin-nicira.install	2012-06-22 16:51:14 +0000
+++ debian/quantum-plugin-nicira.install	2013-03-08 10:50:26 +0000
@@ -1,1 +1,2 @@
 etc/quantum/plugins/nicira/* etc/quantum/plugins/nicira
+bin/quantum-check-nvp-config usr/bin

=== modified file 'debian/rules'
--- debian/rules	2013-03-03 23:03:06 +0000
+++ debian/rules	2013-03-08 10:50:26 +0000
@@ -9,11 +9,6 @@
 override_dh_install:
 	dh_install --fail-missing -X/usr/etc -X/usr/bin
 
-override_dh_installinit:
-	dh_installinit -pquantum-l3-agent --name=quantum-l3-agent
-	dh_installinit -pquantum-l3-agent --name=quantum-metadata-agent
-	dh_installinit
-
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area