cncflora_commons 0.0.39 → 0.0.40

data/lib/cncflora_commons.rb

@@ -113,17 +113,6 @@ def setup(file)
       }
     }
 
-    if ENV["ETCD"] || @config["etcd"]  then
-      etcd_cfg = etcd2config(ENV["ETCD"] || @config["etcd"])
-      onchange(ENV["ETCD"] || @config["etcd"]) do |newconfig|
-        newconfig.each {|k,v| @config[k] = v }
-        if defined? settings then
-          newconfig.each {|k,v| set k.to_sym,v }
-        end
-      end
-      etcd_cfg.each {|k,v| @config[k] = v }
-    end
-
     ENV.each {|k,v| @config[k]=v }
 
     if @config["lang"] then
@@ -146,45 +135,3 @@ def setup(file)
     @config
 end
 
-def flatten(obj)
-  flat = {}
-  if obj["dir"] && obj["nodes"] then
-    obj["nodes"].each { |n|
-      flat = flat.merge(flatten(n))
-    }
-  else
-    key = obj["key"].gsub("/","_").gsub("-","_")
-    flat[key[1..key.length]]=obj["value"]
-  end
-  flat
-end
-
-def etcd2config(server)
-  cfg = flatten( http_get("#{server}/v2/keys/?recursive=true")["node"] )
-  to_add={}
-  cfg.each {|k,v|
-    if k.match(/_port$/) then
-      name = /(\w+)_port/.match(k).captures[0]
-      ip   = cfg["#{name}_networksettings_ipaddress"]
-      port = 80
-      cfg.each {|kk,vv|
-        if /^#{name}_networksettings/.match(kk) && vv == v then 
-          port = /ports_(\d+)_tcp/.match(kk).captures[0] 
-        end
-      }
-      to_add[name] = "http://#{ip}:#{port}"
-    end
-  }
-  to_add.each{|k,v| cfg[k]=v}
-  cfg
-end
-
-def onchange(etcd)
-  Thread.new do
-    while true do
-      a = http_get("#{etcd}/v2/keys/?recursive=true&wait=true")
-      puts "etcd updated"
-      yield etcd2config(etcd)
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cncflora_commons
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors: