Merge remote-tracking branch 'origin/2.2' into 2.2

This commit is contained in:
grossmj committed 2018-11-27 15:47:29 +07:00
commit 83161bcdd4
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -341,7 +341,7 @@ class Controller:
if "appliances" in controller_settings:
for appliance_settings in controller_settings["appliances"]:
try:
appliance = Appliance(appliance_settings["appliance_id"], appliance_settings)
appliance = Appliance(appliance_settings.get("appliance_id"), appliance_settings)
self._appliances[appliance.id] = appliance
except jsonschema.ValidationError as e:
message = "Cannot load appliance with JSON data '{}': {}".format(appliance_settings, e.message)