Bump stable/grizzly next version to 2013.1.4

Change-Id: I817767bcb618edf94363aa34dd0eb6ce897ce141
test_glance.py: Stub out _get_member_model as well.

glanceclient's v2 client needs to also have its _get_member_model()
stubbed out as well, to avoid attempts to reach 'fake_host' during
client instantiation.

Update: Only stub when _get_member_model() when required.

Fixes: bug #1185178.

Cherry picked from https://review.openstack.org/#/c/30795

Change-Id: Ida47b3039c2539103fa3394d1443c896d7a81135
Fix signature of _create_volume() in ThinLVMVolumeDriver

create_volume_from_snapshot will call _create_volume() with the
wrong parameters when using ThinLVMVolumeDriver.  It should be
compatible with LVMVolumeDriver's _create_volume() method.

Fixes bug: 1210853

Conflicts:
	cinder/volume/drivers/lvm.py

(cherry picked from commit 7323d8751538e06bb2dba106ba394bc6e29b8b84)
Change-Id: I18f7baf60601b3bcf01425b505a0579a826f072e
Ensure that qpid connection is closed (from oslo)

This is commit a9bc62814d in oslo-incubator

Fixes bug 1172922

When reestablishing a session and a connection already exists the
existing connection will be closed prior to opening the new one.

Change-Id: I9a25800fe4b56eba89d550e3461ce095bf902f0a
Do not reschedule if copy_image_to_volume fails

Catch any exception raised by copy_image_to_volume and wrap them
in ImageCopyFailure. Raising ImageCopyFailure will prevent
the volume from being rescheduled.

Fixes: bug #1224211
Change-Id: I1366f86927813cadefe742769eb7cff27ed41b7e
Merge "Ensure that qpid connection is closed (from oslo)" into stable/grizzly
Fix secure delete for thick LVM snapshots

This change modifies the behaviour of the secure delete for thick
LVM snapshots to wipe the underlying COW of the snapshot LV
instead of the snapshot LV itself.

This change is necessary because the snapshot LV does not contain
exactly the same number of writable blocks as the original LV.  The
COW includes header information per COW block that identifies the
 device as a COW device as well as the source and destination blocks
for the changed item.  The amount of metadata contained in the COW is
variable based on I/O performed on the snapshot.

This does not change the behavior of secure deletes on thin LVs
or secure deletes on the thick LV snapshot origin.

Closes-Bug: #1191812
Change-Id: I308b554429ac981d709c19b78cdc00389a3f598a
Merge "Fix secure delete for thick LVM snapshots" into stable/grizzly
Merge branch 'stable/grizzly' of https://github.com/openstack/cinder into grizzly