← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/engine/resources/eip.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-10-12 16:53:03 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20131012165303-0sc41ujl3luuu56q
Tags: 2013.2~rc2-0ubuntu1
https://launchpad.net/bugs/1239156
New upstream release candidate (LP: #1239156).

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/resources/eip.py
118
118
                    if e.status_code != 404:
119
119
                        raise e
120
120
            else:
121
 
                self.nova().floating_ips.delete(self.resource_id)
 
121
                try:
 
122
                    self.nova().floating_ips.delete(self.resource_id)
 
123
                except clients.novaclient.exceptions.NotFound:
 
124
                    pass
122
125
 
123
126
    def FnGetRefId(self):
124
127
        return unicode(self._ipaddress())