Skip to content
This repository was archived by the owner on Mar 25, 2021. It is now read-only.

Stop using _LE, make heat-engine not die in OpenStack Pike and later #167

Open
fghaas wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Stop using _LE, make heat-engine not die in OpenStack Pike and later #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1351334
Stop using _LE, make heat-engine not die in OpenStack Pike and later
fghaas Sep 26, 2018
330fa8f
Silence two flake8 E501 errors
fghaas Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions f5_heat/resources/f5_sys_iappcompositetemplate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ def handle_delete(self):
partition=self.partition_name
):
try:
loaded_template = self.bigip.tm.sys.application.templates.template.\
load(
name=self.properties[self.NAME],
partition=self.partition_name
)
templates = self.bigip.tm.sys.application.templates
loaded_template = templates.template.load(
name=self.properties[self.NAME],
partition=self.partition_name
)
loaded_template.delete()
except Exception as ex:
raise exception.ResourceFailure(ex, None, action='DELETE')
Expand Down
10 changes: 5 additions & 5 deletions f5_heat/resources/f5_sys_iappfulltemplate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@ def handle_delete(self):
partition=self.partition_name
):
try:
loaded_template = self.bigip.tm.sys.application.templates.template.\
load(
name=self.template_dict['name'],
partition=self.partition_name
)
templates = self.bigip.tm.sys.application.templates
loaded_template = templates.template.load(
name=self.template_dict['name'],
partition=self.partition_name
)
loaded_template.delete()
except Exception as ex:
raise exception.ResourceFailure(ex, None, action='DELETE')
Expand Down
5 changes: 1 addition & 4 deletions f5_heat/resources/f5_sys_iappservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from heat.common import exception
from heat.common.i18n import _
from heat.common.i18n import _LE
from heat.engine import properties
from heat.engine import resource

Expand Down Expand Up @@ -114,9 +113,7 @@ def _check_iapp_answers(self, prop_name):
self.properties[prop_name]
)
except Exception:
LOG.error(
_LE("'%s' property failed to parse as JSON") % prop_name
)
LOG.error("'%s' property failed to parse as JSON" % prop_name)
raise

def _build_service_dict(self):
Expand Down