Added support for using etcdctl instead of curl in etcd_functions

ezpublishlegacy · Oct 28, 2014 · f672d28 · f672d28
1 parent 21e0f55
commit f672d28
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/files/etcd_functions b/files/etcd_functions
@@ -16,12 +16,30 @@ function get_etcd_value
 {
     local bridge_ip
     bridge_ip=`get_bridge_ip`
-    curl -s -L http://$bridge_ip:4001/v2/keys$1 | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["node"]["value"];'
+    etcdctl --peers="http://$bridge_ip:4001" get $1
 }
 
 # $1 is key, for instance "/message"
 # $2 is value, for instance "hello"
 function set_etcd_value
+{
+    local bridge_ip
+    bridge_ip=`get_bridge_ip`
+    etcdctl --peers="http://$bridge_ip:4001" set $1 $2
+}
+
+#
+# $1 is key, for instance "/message"
+function get_etcd_value_curl
+{
+    local bridge_ip
+    bridge_ip=`get_bridge_ip`
+    curl -s -L http://$bridge_ip:4001/v2/keys$1 | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["node"]["value"];'
+}
+
+# $1 is key, for instance "/message"
+# $2 is value, for instance "hello"
+function set_etcd_value_curl
 {
     local bridge_ip
     bridge_ip=`get_bridge_ip`
@@ -46,4 +64,4 @@ function replace_ip_in_hosts
     cp $tmphosts /etc/hosts
     rm $tmphosts
 
-}
+}