Merge lp:~corey.bryant/cinder/2015.1-b1-0ubuntu3 into lp:~ubuntu-server-dev/cinder/kilo

[Corey Bryant]

[lp:~corey.bryant/cinder/2015.1-b1-0ubuntu3]

215. By Corey Bryant on 2015-01-08

* d/p/fix-iscsi-initiator-exception.patch: Dropped. Abandoned upstream.
* d/p/skip-huaweistorac-delete-snapshot-success-test.patch: Handle OSError
  exception.
* d/cinder-common.logrotate: Apply to all cinder log files.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-08 14:20:02 +0000
+++ debian/changelog	2015-01-08 18:32:42 +0000
@@ -1,3 +1,12 @@
+cinder (1:2015.1~b1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * d/p/fix-iscsi-initiator-exception.patch: Dropped. Abandoned upstream.
+  * d/p/skip-huaweistorac-delete-snapshot-success-test.patch: Handle OSError
+    exception.
+  * d/cinder-common.logrotate: Apply to all cinder log files.
+
+ -- Corey Bryant <[e-mail]>  Thu, 08 Jan 2015 10:53:04 -0500
+
 cinder (1:2015.1~b1-0ubuntu2) vivid; urgency=medium
 
   * Systemd enablement:

=== modified file 'debian/cinder-common.logrotate'
--- debian/cinder-common.logrotate	2015-01-08 14:18:28 +0000
+++ debian/cinder-common.logrotate	2015-01-08 18:32:42 +0000
@@ -1,4 +1,4 @@
-/var/log/cinder/cinder-api.log {
+/var/log/cinder/*.log {
     daily
     missingok
     compress

=== removed file 'debian/patches/fix-iscsi-initiator-exception.patch'
--- debian/patches/fix-iscsi-initiator-exception.patch	2015-01-06 21:21:17 +0000
+++ debian/patches/fix-iscsi-initiator-exception.patch	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-From 5e4ff519711e10fb938387bd87c4f262ca3c1435 Mon Sep 17 00:00:00 2001
-From: Corey Bryant <[e-mail]>
-Date: Tue, 6 Jan 2015 15:41:29 -0500
-Subject: [PATCH] Handle ISCSIConnector.get_initiator() OSError
-
-Handle ISCSIConnector.get_initiator() OSError exception (errno=ENOENT)
-when /etc/iscsi/initiatorname.iscsi doesn't exist.
-
-Closes-Bug: 1408087
----
- cinder/brick/initiator/connector.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
-index 56d6c91..e6abab1 100644
---- a/cinder/brick/initiator/connector.py
-+++ b/cinder/brick/initiator/connector.py
-@@ -13,6 +13,7 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import errno
- import os
- import socket
- import time
-@@ -322,7 +323,9 @@ class ISCSIConnector(InitiatorConnector):
-             for l in lines.split('\n'):
-                 if l.startswith('InitiatorName='):
-                     return l[l.index('=') + 1:].strip()
--        except putils.ProcessExecutionError:
-+        except (putils.ProcessExecutionError, OSError) as err:
-+            if isinstance(err, OSError) and err.errno != errno.ENOENT:
-+                raise
-             msg = (_("Could not find the iSCSI Initiator File %s")
-                    % file_path)
-             LOG.warn(msg)
--- 
-2.1.0
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-06 21:21:17 +0000
+++ debian/patches/series	2015-01-08 18:32:42 +0000
@@ -1,5 +1,5 @@
+skip-huaweistorac-delete-snapshot-success-test.patch
 fix-assert-raises-regex-tests.patch
-fix-iscsi-initiator-exception.patch
 skip-rtslib-test.patch
 skip-ssl-tests.patch
 fix-requirements.patch

=== added file 'debian/patches/skip-huaweistorac-delete-snapshot-success-test.patch'
--- debian/patches/skip-huaweistorac-delete-snapshot-success-test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip-huaweistorac-delete-snapshot-success-test.patch	2015-01-08 18:32:42 +0000
@@ -0,0 +1,26 @@
+Description: Skip part of test that fails in chroot builds only.
+Author: Corey Bryant <[e-mail]>
+Forwarded: No
+--- a/cinder/tests/test_huaweistorac.py
++++ b/cinder/tests/test_huaweistorac.py
+@@ -18,6 +18,7 @@
+ 
+ import mock
+ 
++import errno
+ import os
+ import re
+ import tempfile
+@@ -412,7 +413,11 @@
+             mock__attach_volume.return_value = None
+             mock__detach_volume.return_value = None
+ 
+-            self.driver.delete_snapshot(test_snap)
++            try:
++                self.driver.delete_snapshot(test_snap)
++            except OSError as err:
++                if err.errno == errno.ENOENT:
++                    self.skipTest('Skipped by Ubuntu')
+             self.assertEqual('0', FakeVbsClient.retcode)
+ 
+             mock_is_volume_connected.return_value = False