openstack/octavia
Code Issues Proposed changes

Merge "Stop nova driver delete failure on already deleted"

Browse Source
This commit is contained in:
Jenkins 2015-11-20 03:59:34 +00:00 committed by Gerrit Code Review
commit 822c0be975
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/compute/drivers/nova_driver.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from novaclient import exceptions as nova_exceptions
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
@ -20,7 +21,7 @@ from octavia.common import constants
from octavia.common import data_models as models from octavia.common import data_models as models
from octavia.common import exceptions from octavia.common import exceptions
from octavia.compute import compute_base from octavia.compute import compute_base
from octavia.i18n import _LE from octavia.i18n import _LE, _LW
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -93,6 +94,9 @@ class VirtualMachineManager(compute_base.ComputeBase):
''' '''
try: try:
self.manager.delete(server=compute_id) self.manager.delete(server=compute_id)
except nova_exceptions.NotFound:
LOG.warn(_LW("Nova instance with id: %s not found. "
"Assuming already deleted."), compute_id)
except Exception: except Exception:
LOG.exception(_LE("Error deleting nova virtual machine.")) LOG.exception(_LE("Error deleting nova virtual machine."))
raise exceptions.ComputeDeleteException() raise exceptions.ComputeDeleteException()