Merge lp:~zulcss/nova/refreshed-1 into lp:~ubuntu-server-dev/nova/havana

[Chuck Short]

Refreshed patches.

[Andres Rodriguez (andreserl)]

Lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-30 14:29:02 +0000
+++ debian/changelog	2013-08-02 14:49:38 +0000
@@ -1,4 +1,4 @@
-nova (1:2013.2.a2367.gb404bfd-0ubuntu1) UNRELEASED; urgency=low
+nova (1:2013.2.a2481.ge685a72-0ubuntu1) UNRELEASED; urgency=low
 
   * New usptream release. 
   * debian/patches/avoid_requirements_cheetah.patch: Dropped
@@ -6,6 +6,7 @@
   * debian/patches/fix-requirements.patch: Refreshed.
   * debian/patches/remove-deprecated-sqlalchemy-option.patch: Remove
     deprecated option with sqlalchemy.
+  * debian/patches/path-to-the-xenhost.conf-fixup.patch: Refreshed
 
  -- Chuck Short <[e-mail]>  Tue, 30 Jul 2013 13:05:37 +0000
 

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2013-07-30 14:29:02 +0000
+++ debian/patches/fix-requirements.patch	2013-08-02 14:49:38 +0000
@@ -1,6 +1,6 @@
-diff -Naurp nova-2013.2.a2367.gb404bfd.orig/requirements.txt nova-2013.2.a2367.gb404bfd/requirements.txt
---- nova-2013.2.a2367.gb404bfd.orig/requirements.txt	2013-07-30 13:01:25.000000000 +0000
-+++ nova-2013.2.a2367.gb404bfd/requirements.txt	2013-07-30 13:51:46.198948311 +0000
+diff -Naurp nova-2013.2.a2481.ge685a72.orig/requirements.txt nova-2013.2.a2481.ge685a72/requirements.txt
+--- nova-2013.2.a2481.ge685a72.orig/requirements.txt	2013-08-02 13:51:10.000000000 +0000
++++ nova-2013.2.a2481.ge685a72/requirements.txt	2013-08-02 14:15:43.719156844 +0000
 @@ -1,7 +1,6 @@
  d2to1>=0.2.10,<0.3
  pbr>=0.5.16,<0.6
@@ -10,15 +10,7 @@
  amqplib>=0.6.1
  anyjson>=0.2.4
  argparse
-@@ -21,14 +20,13 @@ paramiko
- pyasn1
- Babel>=0.9.6
- iso8601>=0.1.4
--requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271
-+requests>=1.1
- python-cinderclient>=1.0.1
- python-neutronclient>=2.2.3,<3.0.0
- python-glanceclient>=0.9.0
+@@ -27,7 +26,6 @@ python-glanceclient>=0.9.0
  python-keystoneclient>=0.2.0
  six
  stevedore>=0.10

=== modified file 'debian/patches/path-to-the-xenhost.conf-fixup.patch'
--- debian/patches/path-to-the-xenhost.conf-fixup.patch	2013-03-14 00:48:45 +0000
+++ debian/patches/path-to-the-xenhost.conf-fixup.patch	2013-08-02 14:49:38 +0000
@@ -1,13 +1,12 @@
-Index: nova/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
-===================================================================
---- nova.orig/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost	2013-03-13 17:47:30.328806438 -0700
-+++ nova/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost	2013-03-13 17:47:31.088806477 -0700
-@@ -41,7 +41,7 @@
- pluginlib.configure_logging("xenhost")
+diff -Naurp nova-2013.2.a2481.ge685a72.orig/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost nova-2013.2.a2481.ge685a72/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
+--- nova-2013.2.a2481.ge685a72.orig/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost	2013-08-02 13:51:10.000000000 +0000
++++ nova-2013.2.a2481.ge685a72/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost	2013-08-02 14:00:12.527156844 +0000
+@@ -41,7 +41,7 @@ _ = pluginlib._
+ 
  
  host_data_pattern = re.compile(r"\s*(\S+) \([^\)]+\) *: ?(.*)")
 -config_file_path = "/usr/etc/xenhost.conf"
-+config_file_path = "/etc/xcp/xenhost.conf"
++config_file_path = "/etc/xen/xenhost.conf"
  DEFAULT_TRIES = 23
  DEFAULT_SLEEP = 10
  

=== modified file 'debian/rules'
--- debian/rules	2013-01-25 21:12:38 +0000
+++ debian/rules	2013-08-02 14:49:38 +0000
@@ -58,7 +58,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && testr run --parallel
+	testr init && testr run --concurrency=1
 endif
 
 override_dh_python2: