Merge lp:~corey.bryant/cinder/2014.1.2 into lp:~ubuntu-server-dev/cinder/icehouse

[Corey Bryant]

[Chuck Short (zulcss)]

Can you resync with what we have in the archive.

review: Needs Fixing

[Corey Bryant (corey.bryant)]

> Can you resync with what we have in the archive.

Chuck, thanks for reviewing. I've resync'd and pushed a new version that is ready for review.

[lp:~corey.bryant/cinder/2014.1.2]

182. By Corey Bryant on 2014-08-11

* Resynchronize with stable/icehouse (00d456b) (LP: #1354159):
  - [a1135b7] Fix solidfire accept_transfer
  - [00b7574] Fixes HP LeftHand driver with Paramiko 1.13.0
  - [22e451b] Set python hash seed to 0 in tox.ini
  - [cd7dd94] Get updated model info on volume transfer
  - [f6df82c] Ensure flushing of IO prior to removing FC device
  - [63ba651] Don't leave snapshots on the floor
  - [c74efd7] Retry lvremove with ignore_suspended_devices
  - [fe37a6e] Remove second get call to list/show volumes
  - [1d80539] Add cinder-manage cmd to update host column
  - [d12c513] Fix host option isn't set when using multiple backend
  - [570c90f] Add the -f option back to lvremove
  - [170632f] Update requirements.txt to disallow alpha libs
  - [04c7431] Allow host config to be overriden in backend
  - [f96e991] Storwize/SVC driver detach volume failed
  - [c4d3c1c] Fix handling multiple WWPNs on preferred FC node
  - [3877a73] vmware: Fix problems with VIM API retry logic
  - [cab4ef6] Specify lld in tgt config backends
  - [d4392f3] Fix retyping volume that has volume type None
  - [d6829c1] Ensure that lun_id is an int
  - [00d456b] GET details REST API next link missing 'details'
* d/p/fix-requirements.patch: Refreshed.
* SECURITY UPDATE: specify /etc/cinder/rootwrap.conf for use with
  cinder-rootwrap
  - CVE-2013-1068 (LP: #1185019)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 08:01:30 +0000
+++ debian/changelog	2014-08-11 13:52:39 +0000
@@ -1,3 +1,36 @@
+cinder (1:2014.1.2-0ubuntu1) trusty; urgency=medium
+
+  [ Corey Bryant ]
+  * Resynchronize with stable/icehouse (00d456b) (LP: #1354159):
+    - [a1135b7] Fix solidfire accept_transfer
+    - [00b7574] Fixes HP LeftHand driver with Paramiko 1.13.0
+    - [22e451b] Set python hash seed to 0 in tox.ini
+    - [cd7dd94] Get updated model info on volume transfer
+    - [f6df82c] Ensure flushing of IO prior to removing FC device
+    - [63ba651] Don't leave snapshots on the floor
+    - [c74efd7] Retry lvremove with ignore_suspended_devices
+    - [fe37a6e] Remove second get call to list/show volumes
+    - [1d80539] Add cinder-manage cmd to update host column
+    - [d12c513] Fix host option isn't set when using multiple backend
+    - [570c90f] Add the -f option back to lvremove
+    - [170632f] Update requirements.txt to disallow alpha libs
+    - [04c7431] Allow host config to be overriden in backend
+    - [f96e991] Storwize/SVC driver detach volume failed
+    - [c4d3c1c] Fix handling multiple WWPNs on preferred FC node
+    - [3877a73] vmware: Fix problems with VIM API retry logic
+    - [cab4ef6] Specify lld in tgt config backends
+    - [d4392f3] Fix retyping volume that has volume type None
+    - [d6829c1] Ensure that lun_id is an int
+    - [00d456b] GET details REST API next link missing 'details'
+  * d/p/fix-requirements.patch: Refreshed.
+
+  [ Jamie Strandboge <[e-mail]> ]
+  * SECURITY UPDATE: specify /etc/cinder/rootwrap.conf for use with
+    cinder-rootwrap
+    - CVE-2013-1068 (LP: #1185019)
+
+ -- Corey Bryant <[e-mail]>  Fri, 08 Aug 2014 11:21:47 -0400
+
 cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
 
=== modified file 'debian/cinder_sudoers'
--- debian/cinder_sudoers	2012-07-07 07:49:54 +0000
+++ debian/cinder_sudoers	2014-08-11 13:52:39 +0000
@@ -1,3 +1,3 @@
 Defaults:cinder !requiretty
 
-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
+cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf *
 
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-08-11 13:52:39 +0000
@@ -0,0 +1,19 @@
+Description: Requirement alignment for Ubuntu 14.04
+ rtslib-fb: not supported in Ubuntu, dropped.
+ six: 1.5.2 present in 14.04, features of 1.6.0 not used.
+Forwarded: not-needed
+
+Index: cinder/requirements.txt
+===================================================================
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -22,8 +22,7 @@
+ requests>=1.1
+ Routes>=1.12.3,!=2.0
+ taskflow>=0.1.3,<0.2
+-rtslib-fb>=2.1.39
+-six>=1.6.0
++six>=1.5.2
+ SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ stevedore>=0.14
 
=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-06-16 08:01:30 +0000
+++ debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Description: Requirement alignment for Ubuntu 14.04
- rtslib-fb: not supported in Ubuntu, dropped.
- six: 1.5.2 present in 14.04, features of 1.6.0 not used.
-Forwarded: not-needed
-
-Index: cinder/requirements.txt
-===================================================================
---- cinder.orig/requirements.txt	2014-06-09 14:41:57.268598007 -0400
-+++ cinder/requirements.txt	2014-06-09 14:42:20.900598907 -0400
-@@ -22,8 +22,7 @@
- requests>=1.1
- Routes>=1.12.3
- taskflow>=0.1.3,<0.2
--rtslib-fb>=2.1.39
--six>=1.6.0
-+six>=1.5.2
- SQLAlchemy>=0.7.8,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
- stevedore>=0.14