Remove cinder gating hack

The hack was necessary while we switched the name used for az's
in the gating tests. Now it can be removed

Change-Id: I970205910ac0950ab4a961aa0537eb964d7f0d3c
(cherry picked from commit bc0fb113af225878b4305da7d834673a6b7f5e97)

diff --git a/cinder/api/openstack/volume/volumes.py b/cinder/api/openstack/volume/volumes.py
index f38c669f16ae2bab6082103575620d317a326f9b..2c6852b5a177dba7a5c6197caff2a20d707e0c29 100644 (file)
--- a/cinder/api/openstack/volume/volumes.py
+++ b/cinder/api/openstack/volume/volumes.py
@@ -319,9 +319,6 @@ class VolumeController(wsgi.Controller):
                 kwargs['image_id'] = image_uuid
 
         kwargs['availability_zone'] = volume.get('availability_zone', None)
-        # NOTE(vish): Temporary hack to work around gating issues
-        if kwargs['availability_zone'] == 'cinder':
-            kwargs['availability_zone'] = 'nova'
 
         new_volume = self.volume_api.create(context,
                                             size,