1
commit 4cde3ad6ecc094602bc884052afcde08243e55cd
2
Author: Alan Pevec <apevec@redhat.com>
3
Date: Thu Apr 11 16:17:24 2013 +0200
5
Final versioning for 2012.2.4
7
Change-Id: Ic9ee9a7336c8f5f64ad4700c0322653e331c10bb
9
cinder/version.py | 2 +-
10
1 file changed, 1 insertion(+), 1 deletion(-)
12
commit ec46ee080fabbf01259b02c86681bcb432278d18
13
Author: Rushi Agrawal <rushi.agr@gmail.com>
14
Date: Thu Apr 4 04:21:00 2013 +0530
16
NetApp: dont allow volume from snapshots of different size
18
This patch disallows creation of volume from snapshot of
19
different size. Previously, it seemingly allowed creation of a volume
20
from snapshot of different size, but in fact, created the volume
21
of the same size as that of the snapshot
25
Change-Id: Id35175d23baf5f5f19db4fe3968a96f980fcaa65
27
cinder/volume/netapp.py | 6 ++++++
28
1 file changed, 6 insertions(+)
30
commit 92fe971ce43c6f4fb901fa78dc6fa936b0b25b0a
31
Merge: c2d800a 00e8049
32
Author: Jenkins <jenkins@review.openstack.org>
33
Date: Fri Apr 5 16:41:26 2013 +0000
35
Merge "NetApp[backport]: Fix for snapshot not deleted in error state." into stable/folsom
37
commit c2d800ac6a82e830f00174c20385ceefab47d878
38
Merge: 0529609 ce516f6
39
Author: Jenkins <jenkins@review.openstack.org>
40
Date: Fri Apr 5 16:36:09 2013 +0000
42
Merge "Sync rpc changes from oslo stable/folsom" into stable/folsom
44
commit 052960984ed9b3457b651ef974a92f7f87881dad
45
Merge: e63fa95 cdb72ee
46
Author: Jenkins <jenkins@review.openstack.org>
47
Date: Fri Apr 5 12:27:00 2013 +0000
49
Merge "Enable direct testing with nosetests" into stable/folsom
51
commit ce516f6a2367b50ccfd4a1d061acae109cd9b7d2
52
Author: Eric Harney <eharney@redhat.com>
53
Date: Mon Feb 18 16:15:45 2013 -0500
55
Sync rpc changes from oslo stable/folsom
57
Contains code from the following oslo commits:
59
9f938720 Update common code to support pep 1.3.
60
7e36792c kombu's fanout_cast_to_server was calling wrong method
62
c3ec615c LOG.exception() should only be used in exception handler
63
17c5188c Use pep8 v1.3.3
64
d147d9f2 Fix QPID reconnect issues
67
Change-Id: Ia4504cb4d8f2108b743efc4639450254d6e3fb8e
69
cinder/openstack/common/rpc/impl_kombu.py | 37 +++++++------
70
cinder/openstack/common/rpc/impl_qpid.py | 83 ++++++++++++-----------------
71
2 files changed, 55 insertions(+), 65 deletions(-)
73
commit 00e8049cbec550a0342054a02fc3ea35be25dad0
74
Author: Rushi Agrawal <rushi.agr@gmail.com>
75
Date: Tue Mar 12 01:39:44 2013 +0530
77
NetApp[backport]: Fix for snapshot not deleted in error state.
79
This fix enables cleaning of volumes/snapshots
80
in error state by allowing them to delete.
81
It will allow the delete call to be
82
successful if snapshot/volume are in
83
error state. This also fixes the bug
84
raised recently with number 1145409 which seems
85
to be duplicate of 1143661.
90
Change-Id: I38bc13e676404f96db54b12edfa56680489e893e
92
cinder/volume/netapp.py | 11 ++++++++++-
93
1 file changed, 10 insertions(+), 1 deletion(-)
95
commit e63fa95236a62f8b793cc9e5bc773c8597cca380
96
Author: Rushi Agrawal <rushi.agr@gmail.com>
97
Date: Mon Mar 18 23:31:47 2013 +0530
99
NetApp[Backport]: Clean up QTree when deleting volume
101
Previously, deleting a Cinder volume would leave a QTree on NetApp
102
storage box. This commit fixes the issue.
106
Change-Id: I95f1d6b802f4abfad421d34f1c000b75fb72c41e
108
cinder/tests/test_netapp.py | 2 ++
109
cinder/volume/netapp.py | 24 +++++++++++++++++++++---
110
2 files changed, 23 insertions(+), 3 deletions(-)
112
commit e3146aa27b1ef7baddfc1eedb0d15e2fd726fdf6
113
Merge: 2e7f717 8e702a1
114
Author: Jenkins <jenkins@review.openstack.org>
115
Date: Sun Mar 31 19:30:57 2013 +0000
117
Merge "Fix inability to delete volumes in error state for NetApp driver" into stable/folsom
119
commit 2e7f71738d2f695e8079ef0cd3b6c248ee67187e
120
Author: John Griffith <john.griffith@solidfire.com>
121
Date: Thu Feb 28 19:01:39 2013 +0000
123
Elevate context for delete volume with no host.
125
So in the case of a volume that is placed in error state
126
on create and never actually deployed, the cinder.volume.api delete
127
call does a short cut call to db.destroy_volume which is fine because
128
all we have is a DB entry (scheduler never deployed the volume).
130
Unfortunately, this requires admin context, so just add an elevate
131
context to the db.destroy_volume call.
135
Change-Id: I0ef8bf4356047c385bef703b8dce7d5edf537bf6
136
(cherry picked from commit a2830e5417539980249e3ab12d8bf9538d8956c4)
138
cinder/volume/api.py | 3 +--
139
1 file changed, 1 insertion(+), 2 deletions(-)
141
commit ad2ddddba50a5d822ddde78782142297f992b408
142
Author: Vishvananda Ishaya <vishvananda@gmail.com>
143
Date: Mon Mar 25 12:46:51 2013 -0700
145
Force deletes using tgt to workaround bug 1159948
147
Tgt has a bug where it can have multiple copies of an initiator
148
if there has been a reconnect.
150
See https://bugs.launchpad.net/cinder/+bug/1159948
152
Change-Id: I9a1b6757eb780efbaa1403016e50de7c0e45d720
153
(cherry picked from commit b84218633ab5417adf94c568eb54243f4074ab11)
155
cinder/tests/test_iscsi.py | 2 +-
156
cinder/volume/iscsi.py | 3 +++
157
2 files changed, 4 insertions(+), 1 deletion(-)
159
commit cdb72ee36a455e1358a7c451e28f2fa158766096
160
Author: Dirk Mueller <dirk@dmllr.de>
161
Date: Mon Mar 25 14:28:54 2013 +0100
163
Enable direct testing with nosetests
165
This is the minimal backport of
166
https://review.openstack.org/#/c/21685/
167
which makes it possible to run the functional
168
tests without also invoking run_tests.sh. The
169
extra call to monkey_patch is not causing any
170
harm when used via run_tests.sh
172
Change-Id: If0d2cb94f956380a2c35414b6e8df6db76a669c6
174
cinder/tests/__init__.py | 3 +++
175
1 file changed, 3 insertions(+)
177
commit db0595a4c516738f110482396e0fe90ecaf71b38
178
Author: Avishay Traeger <avishay@il.ibm.com>
179
Date: Tue Mar 19 08:24:50 2013 +0200
181
Backport paramiko 1.8.0 requirement to Folsom.
183
Require paramiko >= 1.8.0
185
There is a well-known bug in the Paramiko SSH library that causes
187
SSHException: Error connecting via ssh: PID check failed. RNG must be
188
re-initialized after fork(). Hint: Try Random.atfork()
190
This bug has been fixed in Paramiko, and therefore we should require
191
the newer version for Cinder drivers that use Paramiko to function
194
Change-Id: Ia14b7b72393e2a2482ebde418b5477934779bf13
197
tools/pip-requires | 2 +-
198
1 file changed, 1 insertion(+), 1 deletion(-)
200
commit 8e702a13ef6c13e33fe84f6347d65cbb8ed0ee3a
201
Author: Rushi Agrawal <rushi.agr@gmail.com>
202
Date: Wed Mar 6 03:11:55 2013 +0530
204
Fix inability to delete volumes in error state for NetApp driver
206
While using NetApp 7-mode storage box to create volumes, if the volume
207
is not created on the storage box (possibly due to wrong/missing
208
options in cinder.conf file), the volume goes in error state, and when
209
one tries to delete the volume, an exception was raised which made
210
the volume go in error_deleting state, which is unrecoverable. This
211
commit quiesces that exception, resulting in successful removal of the
212
volume entry from the volume table.
216
Change-Id: I0a25b71ad03e7f7acf58df3952e074ff164b82ff
218
cinder/tests/test_netapp.py | 3 +++
219
cinder/volume/netapp.py | 8 +++++++-
220
2 files changed, 10 insertions(+), 1 deletion(-)
222
commit ebcd4b7c7f98ea3431890b0b38098e8034fa06f8
223
Merge: cbad3e3 a616001
224
Author: Jenkins <jenkins@review.openstack.org>
225
Date: Tue Mar 12 02:41:56 2013 +0000
227
Merge "Only use iscsi_helper config option if using ISCSIDriver" into stable/folsom
229
commit cbad3e33b5a76e2ae427b943bb4453934d11ed30
230
Author: Eric Harney <eharney@redhat.com>
231
Date: Fri Mar 8 17:38:38 2013 -0500
233
Raise NotImplementedError for NFS snapshot operations
235
Since NfsDriver inherits snapshot related methods from VolumeDriver,
236
it will try to run LVM commands for snapshot calls, when it should
237
just report that these are not supported for NFS.
241
Change-Id: Ia438c88d3c8c0a43b512bba9b273e1305f6d0dd0
243
cinder/volume/nfs.py | 9 +++++++++
244
1 file changed, 9 insertions(+)
246
commit 95a620b9215b937acf73d7248357e1317bc8bca5
247
Merge: 0eeca98 95c9f6f
248
Author: Jenkins <jenkins@review.openstack.org>
249
Date: Fri Feb 22 18:04:57 2013 +0000
251
Merge "Fix error for extra specs update with empty body." into stable/folsom
253
commit 0eeca986ef19f0b1b6cc5e212606e575a63cf20e
254
Merge: 68de70d aeece14
255
Author: Jenkins <jenkins@review.openstack.org>
256
Date: Fri Feb 22 18:04:55 2013 +0000
258
Merge "Check for non-default volume name template." into stable/folsom
260
commit a6160015c4a9dd20e3303227ecb537bf5cc92c07
261
Author: Eric Harney <eharney@redhat.com>
262
Date: Fri Feb 22 11:20:21 2013 -0500
264
Only use iscsi_helper config option if using ISCSIDriver
266
_get_iscsi_properties checks for iscsi_helper == 'tgtadm', but
267
this is run for drivers other than ISCSIDriver. This means that
268
when using the Nexenta driver, the target_lun is changed when it
271
Only change target_lun based on iscsi_helper if using ISCSIDriver.
273
Change-Id: I104c1b45f37917ea9f41855c17405f63c4ebcc39
275
cinder/volume/driver.py | 3 ++-
276
1 file changed, 2 insertions(+), 1 deletion(-)
278
commit 68de70dd98911d44fc0825cfd9408ddbc7e978a4
279
Merge: a8caa79 fcf249d
280
Author: Jenkins <jenkins@review.openstack.org>
281
Date: Wed Feb 20 00:25:38 2013 +0000
283
Merge "Add a safe_minidom_parse_string function." into stable/folsom
285
commit fcf249d1f06938280d841cb13b61556971a58e0c
286
Author: Dan Prince <dprince@redhat.com>
287
Date: Sun Feb 3 22:25:12 2013 -0500
289
Add a safe_minidom_parse_string function.
291
Adds a new utils.safe_minidom_parse_string function and
292
updates external API facing Cinder modules to use it.
293
This ensures we have safe defaults on our incoming API XML parsing.
295
Internally safe_minidom_parse_string uses a ProtectedExpatParser
296
class to disable DTDs and entities from being parsed when using
299
Fixes LP Bug #1100282 for Folsom.
301
Change-Id: Ie8ae7a6e12fbf51de406d10ca21072140374abf5
303
cinder/api/openstack/common.py | 9 ++--
304
.../api/openstack/volume/contrib/volume_actions.py | 4 +-
305
cinder/api/openstack/volume/volumes.py | 3 +-
306
cinder/api/openstack/wsgi.py | 5 ++-
307
cinder/tests/test_utils.py | 33 +++++++++++++++
308
cinder/utils.py | 44 ++++++++++++++++++++
309
6 files changed, 88 insertions(+), 10 deletions(-)
311
commit 95c9f6f5a9fa2e08f5499f23294272d5d95a5568
312
Author: Avishay Traeger <avishay@il.ibm.com>
313
Date: Mon Jan 21 10:19:02 2013 +0200
315
Fix error for extra specs update with empty body.
318
Change-Id: Ia2792d477f7670ecb2eb0c9c10dcbf1cf5b2389e
319
(cherry picked from commit fee9b2ad61bb69d356e1280f0556afd808c5f128)
321
.../openstack/volume/contrib/types_extra_specs.py | 3 ++-
322
.../volume/contrib/test_types_extra_specs.py | 26 ++++++++++----------
323
2 files changed, 15 insertions(+), 14 deletions(-)
325
commit a8caa79fd93e9837055660904494141251572413
326
Author: Ollie Leahy <oliver.leahy@hp.com>
327
Date: Tue Jan 29 11:25:27 2013 +0000
329
Fix typo in cinder/db/api.py
331
The api method quota_destroy_all_by_project() calls the implementation
332
quota_get_all_by_project()
334
Change-Id: I11927e1fd29c6248ce755dfd236bf0f9adf39d94
336
(cherry picked from commit b79e1f485c85cbb16280adc8d590886e25694c87)
338
cinder/db/api.py | 2 +-
339
cinder/tests/test_quota.py | 15 +++++++++++++++
340
2 files changed, 16 insertions(+), 1 deletion(-)
342
commit aeece14ceab7d10acc63742a3dc55eba4f240f63
343
Author: John Griffith <john.griffith@solidfire.com>
344
Date: Sun Jan 20 22:52:52 2013 +0000
346
Check for non-default volume name template.
348
The iscsi delete methods in iscsi.py had hard-coded volume names
351
If a user configured volume_name_template to
352
something other than default the result is failure to remove
355
volume create worked appropriately and created the correct name
356
in the DB, so the persistence files were the only thing affected
357
or named incorrectly.
361
Change-Id: Id5575874b2cebd9b3509d739cb92abf06c503c4e
362
(cherry picked from commit f02c575b4b28b69cade6c1c06dd772c62754fc9c)
364
cinder/volume/iscsi.py | 3 ++-
365
1 file changed, 2 insertions(+), 1 deletion(-)
367
commit 712f5ce76f8f3d095212df079040d1e60867895e
368
Author: Mark McLoughlin <markmc@redhat.com>
369
Date: Thu Jan 31 21:33:47 2013 +0000
371
Bump version to 2012.2.4
373
Set version to 2012.2.4, but with final=False
375
Change-Id: I9dab1dc62e41cdb4143a3c8083e65c4b13a22eb4
377
cinder/version.py | 4 ++--
378
1 file changed, 2 insertions(+), 2 deletions(-)
1
380
commit a52ca0c0a03b3c15847445d8e4e9b52e9dab46c1
2
381
Author: Mark McLoughlin <markmc@redhat.com>
3
382
Date: Thu Jan 31 21:30:33 2013 +0000
2976
3355
Change-Id: Iad69354dd47c2a0dfa3a23a95c1a23eb66773b8d
2978
cinder/api/openstack/common.py | 5 -----
2979
.../volume/contrib/extended_snapshot_attributes.py | 1 -
2980
.../api/openstack/volume/contrib/volume_actions.py | 2 --
2981
cinder/api/openstack/wsgi.py | 2 --
2982
cinder/api/sizelimit.py | 1 -
2983
cinder/db/sqlalchemy/migration.py | 1 -
2984
cinder/db/sqlalchemy/models.py | 1 -
2985
cinder/openstack/common/notifier/api.py | 1 -
2986
cinder/openstack/common/rpc/common.py | 2 --
2987
cinder/test.py | 3 ---
2988
cinder/testing/runner.py | 2 --
2989
cinder/tests/api/openstack/common.py | 2 --
2990
cinder/tests/api/openstack/test_common.py | 4 ----
2991
cinder/tests/api/openstack/test_wsgi.py | 3 ---
2992
cinder/tests/db/fakes.py | 1 -
2993
cinder/tests/integrated/api/client.py | 1 -
2994
cinder/tests/integrated/test_extensions.py | 1 -
2995
cinder/tests/integrated/test_xml.py | 1 -
2996
cinder/tests/scheduler/fakes.py | 2 --
2997
cinder/tests/scheduler/test_scheduler.py | 6 ------
2998
cinder/tests/test_flags.py | 2 --
2999
cinder/tests/test_migrations.py | 1 -
3000
cinder/tests/test_misc.py | 7 -------
3001
cinder/tests/test_quota.py | 1 -
3002
cinder/tests/test_storwize_svc.py | 1 -
3003
cinder/tests/test_test_utils.py | 1 -
3004
cinder/tests/test_utils.py | 6 ------
3005
cinder/volume/netapp.py | 1 -
3006
cinder/volume/storwize_svc.py | 1 -
3357
cinder/api/openstack/common.py | 5 -----
3358
.../openstack/volume/contrib/extended_snapshot_attributes.py | 1 -
3359
cinder/api/openstack/volume/contrib/volume_actions.py | 2 --
3360
cinder/api/openstack/wsgi.py | 2 --
3361
cinder/api/sizelimit.py | 1 -
3362
cinder/db/sqlalchemy/migration.py | 1 -
3363
cinder/db/sqlalchemy/models.py | 1 -
3364
cinder/openstack/common/notifier/api.py | 1 -
3365
cinder/openstack/common/rpc/common.py | 2 --
3366
cinder/test.py | 3 ---
3367
cinder/testing/runner.py | 2 --
3368
cinder/tests/api/openstack/common.py | 2 --
3369
cinder/tests/api/openstack/test_common.py | 4 ----
3370
cinder/tests/api/openstack/test_wsgi.py | 3 ---
3371
cinder/tests/db/fakes.py | 1 -
3372
cinder/tests/integrated/api/client.py | 1 -
3373
cinder/tests/integrated/test_extensions.py | 1 -
3374
cinder/tests/integrated/test_xml.py | 1 -
3375
cinder/tests/scheduler/fakes.py | 2 --
3376
cinder/tests/scheduler/test_scheduler.py | 6 ------
3377
cinder/tests/test_flags.py | 2 --
3378
cinder/tests/test_migrations.py | 1 -
3379
cinder/tests/test_misc.py | 7 -------
3380
cinder/tests/test_quota.py | 1 -
3381
cinder/tests/test_storwize_svc.py | 1 -
3382
cinder/tests/test_test_utils.py | 1 -
3383
cinder/tests/test_utils.py | 6 ------
3384
cinder/volume/netapp.py | 1 -
3385
cinder/volume/storwize_svc.py | 1 -
3007
3386
29 files changed, 63 deletions(-)
3009
3388
commit 3b9379c6fba605589c6b753163e5c8f8670c73bf