Fix Elasticsearch settings on newer versions

alexmuller · alexmuller · commit d95376d417a2 · 2015-04-10T11:55:57.000+01:00
Newer versions of Elasticsearch do not return a key of "ok" in the
response body when changing a setting, which means this task
fails on our newest machines.

Amend the conditional so that we only check for "acknowledged",
unless we're on an old version of Elasticsearch in which case
also check for "ok".

We can remove the 2nd conditional once all of the old Elasticsearch
is gone.
diff --git a/elasticsearch.py b/elasticsearch.py
@@ -1,3 +1,4 @@
+from distutils.version import StrictVersion
 from fabric.api import *
 from time import sleep
 import json
@@ -41,8 +42,11 @@ def put_setting(setting, value):
         "transient": {"%s": "%s"}
     }'""" % (setting, value))
     parsed_result = json.loads(result)
-    if not parsed_result.get("ok") or not parsed_result.get("acknowledged"):
-        raise RuntimeError("Failed to put setting: %s" % (result, ))
+    if not parsed_result.get("acknowledged"):
+        raise RuntimeError("Failed to put setting: %s".format(result))
+    if StrictVersion(version()) < StrictVersion('1.0'):
+        if not parsed_result.get("ok"):
+            raise RuntimeError("Failed to put setting: %s".format(result))
 
 
 @task
