Merge lp:~zulcss/nova/nova-api-fix-too into lp:~ubuntu-server-dev/nova/icehouse

[Chuck Short]

Nova-api-metadata service fix

[lp:~zulcss/nova/nova-api-fix-too]

652. By Chuck Short on 2014-01-30

releasing package nova version 1:2014.1~b2-0ubuntu2

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-28 14:19:55 +0000
+++ debian/changelog	2014-01-30 16:25:47 +0000
@@ -1,8 +1,9 @@
-nova (1:2014.1~b2-0ubuntu2) UNRELEASED; urgency=medium
-
-  * debian/patches/fix-requirements.patch: Refreshed 
-
- -- Chuck Short <[e-mail]>  Tue, 28 Jan 2014 09:19:36 -0500
+nova (1:2014.1~b2-0ubuntu2) trusty; urgency=medium
+
+  * debian/patches/fix-nova-api-fake-network.patch: Fixed nova-api-metadata
+    not starting. (LP: #1270845)
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jan 2014 11:24:16 -0500
 
 nova (1:2014.1~b2-0ubuntu1) trusty; urgency=low
 

=== added file 'debian/patches/fix-nova-api-fake-network.patch'
--- debian/patches/fix-nova-api-fake-network.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-nova-api-fake-network.patch	2014-01-30 16:25:47 +0000
@@ -0,0 +1,100 @@
+commit 94587d814f21fa0787dd5447c7581c2f0cfe7966
+Author: Alexis Lee <[e-mail]>
+Date:   Wed Jan 8 10:43:58 2014 +0000
+
+    Move fake_network config option to linux_net
+    
+    Option 'fake_network' is used by nova/network/linux_net.py but not
+    imported from nova/network/manager.py. Both use it, but manager imports
+    linux_net (via nova/network/api.py + nova/network/floating_ips.py) so it
+    makes more sense to define the option in linux_net and import_opt in
+    manager.
+    
+    Precise example import chain:
+        bin/nova-manage
+        nova/cmd/manage.py: import_opt('flat_network_bridge', 'nova.network.manager')
+        nova/network/manager.py: from nova.network import api as network_api
+          -- At this point, manager has started to import but not yet called
+          register_opts
+        nova/network/api.py: from nova.network import floating_ips
+        nova/nova/network/floating_ips.py: import_opt('public_interface', 'nova.network.linux_net')
+        nova/nova/network/linux_net.py: import_opt('fake_network', 'nova.network.manager')
+          -- BANG! Manager hasn't registered the option we want to import
+    
+    Change-Id: I66f021b34aef650dca148a58203c249f6aa0e83e
+
+diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
+index baf5d5d..639f63e 100644
+--- a/etc/nova/nova.conf.sample
++++ b/etc/nova/nova.conf.sample
+@@ -1154,6 +1154,10 @@
+ # value)
+ #ovs_vsctl_timeout=120
+ 
++# If passed, use fake network devices and addresses (boolean
++# value)
++#fake_network=false
++
+ 
+ #
+ # Options defined in nova.network.manager
+@@ -1211,10 +1215,6 @@
+ # value)
+ #create_unique_mac_address_attempts=5
+ 
+-# If passed, use fake network devices and addresses (boolean
+-# value)
+-#fake_network=false
+-
+ # If True, skip using the queue and make local calls (boolean
+ # value)
+ #fake_call=false
+diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
+index 4f1624f..dc63970 100644
+--- a/nova/network/linux_net.py
++++ b/nova/network/linux_net.py
+@@ -127,6 +127,9 @@ linux_net_opts = [
+                default=120,
+                help='Amount of time, in seconds, that ovs_vsctl should wait '
+                     'for a response from the database. 0 is to wait forever.'),
++    cfg.BoolOpt('fake_network',
++                default=False,
++                help='If passed, use fake network devices and addresses'),
+     ]
+ 
+ CONF = cfg.CONF
+diff --git a/nova/network/manager.py b/nova/network/manager.py
+index 9ade2b8..635426e 100644
+--- a/nova/network/manager.py
++++ b/nova/network/manager.py
+@@ -126,9 +126,6 @@ network_opts = [
+     cfg.IntOpt('create_unique_mac_address_attempts',
+                default=5,
+                help='Number of attempts to create unique mac address'),
+-    cfg.BoolOpt('fake_network',
+-                default=False,
+-                help='If passed, use fake network devices and addresses'),
+     cfg.BoolOpt('fake_call',
+                 default=False,
+                 help='If True, skip using the queue and make local calls'),
+@@ -168,6 +165,7 @@ CONF.register_opts(network_opts)
+ CONF.import_opt('use_ipv6', 'nova.netconf')
+ CONF.import_opt('my_ip', 'nova.netconf')
+ CONF.import_opt('network_topic', 'nova.network.rpcapi')
++CONF.import_opt('fake_network', 'nova.network.linux_net')
+ 
+ 
+ class RPCAllocateFixedIP(object):
+diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py
+index e29087f..f8b2ef4 100644
+--- a/nova/tests/conf_fixture.py
++++ b/nova/tests/conf_fixture.py
+@@ -29,7 +29,7 @@ CONF = cfg.CONF
+ CONF.import_opt('use_ipv6', 'nova.netconf')
+ CONF.import_opt('host', 'nova.netconf')
+ CONF.import_opt('scheduler_driver', 'nova.scheduler.manager')
+-CONF.import_opt('fake_network', 'nova.network.manager')
++CONF.import_opt('fake_network', 'nova.network.linux_net')
+ CONF.import_opt('network_size', 'nova.network.manager')
+ CONF.import_opt('num_networks', 'nova.network.manager')
+ CONF.import_opt('floating_ip_dns_manager', 'nova.network.floating_ips')

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-01-28 14:19:55 +0000
+++ debian/patches/fix-requirements.patch	2014-01-30 16:25:47 +0000
@@ -1,18 +1,24 @@
-diff --git a/requirements.txt b/requirements.txt
-index c360250..b05a2df 100644
---- a/requirements.txt
-+++ b/requirements.txt
+diff -Naurp nova-2014.1.dev555.g80efcae.orig/requirements.txt nova-2014.1.dev555.g80efcae/requirements.txt
+--- nova-2014.1.dev555.g80efcae.orig/requirements.txt	2014-01-22 11:10:01.000000000 -0500
++++ nova-2014.1.dev555.g80efcae/requirements.txt	2014-01-23 09:30:24.278874319 -0500
+@@ -1,5 +1,5 @@
+ pbr>=0.5.21,<1.0
+-SQLAlchemy>=0.7.8,<=0.7.99
++SQLAlchemy>=0.7.8,<=0.8.99
+ amqplib>=0.6.1
+ anyjson>=0.3.3
+ argparse
 @@ -9,7 +9,7 @@ Jinja2
  kombu>=2.4.8
  lxml>=2.3
  Routes>=1.12.3
 -WebOb>=1.2.3,<1.3
-+WebOb>=1.2.3
++WebOb>=1.2.3,<1.4
  greenlet>=0.3.2
  PasteDeploy>=1.5.0
  Paste
 @@ -27,8 +27,6 @@ python-glanceclient>=0.9.0
- python-keystoneclient>=0.4.2
+ python-keystoneclient>=0.4.1
  six>=1.4.1
  stevedore>=0.12
 -websockify>=0.5.1,<0.6
@@ -20,4 +26,3 @@
  oslo.config>=1.2.0
  oslo.rootwrap
  pycadf>=0.1.9
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-11 10:06:24 +0000
+++ debian/patches/series	2014-01-30 16:25:47 +0000
@@ -4,3 +4,4 @@
 fix-novnc-regression.patch
 sqlachemy-0.8.3-compat.patch
 skip_ipv6_test.patch
+fix-nova-api-fake-network.patch