From fe236e66094a172da63e09b36c905c7265156fd7 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 21 Sep 2012 00:32:56 +0000
Subject: [PATCH] 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)
---
cinder/api/openstack/volume/volumes.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/cinder/api/openstack/volume/volumes.py b/cinder/api/openstack/volume/volumes.py
index f38c669f1..2c6852b5a 100644
--- 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,
--
2.45.2