teamd-installer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06138720597bb3648ab500c78d15d63f7039c853
-  data.tar.gz: 41a3b471af13defaed54f5a6f5f81aa636e55338
+  metadata.gz: 8cd920c171bede1f620e2c50bb26bdda1fd0b466
+  data.tar.gz: d1fce94e865befdedad145304a6f2271d175cf00
 SHA512:
-  metadata.gz: 6c333e02bbaf974895f350ff693f0950e032001dad452db3dc0effebb790db38e100a216283424d3b1f7a9262ff65d5abff38c8220e430b7708a1df8979ecef0
-  data.tar.gz: 80f94321413d931729f8e4a22f131602d9079e6878ddd3c237942dd5cfb0f3b1981f02b5470a7f7b03b7532b567f87b0b0f49778d8b90849a82415167b566253
+  metadata.gz: ba90d8f7e64d1850965d7b854e8fa2f3556c98614538dcc005941650951969fccd7fecb5ab0ab5feb1fdf035f7ea929f6b76681d449453bf1f2d3affe0d31df9
+  data.tar.gz: 483a66985b78aa7ab3e3b3e45953fcb072677db007faf5b582b9b49cfd70d008a9ee974b86e72e3ce8a6adbac2659d3eebaadaf185eb26bbb1eda535ff0cb3ba

data/lib/teamd/installer/cli.rb

@@ -18,7 +18,7 @@ module Teamd
         @token        ||= options[:etcd_discovery_id]
         @token        ||= TeamdTokenProvider.token
         @token        ||= EtcdTokenProvider.token
-        @public_ipv4  ||= Interfaces.default_ipv4
+        @public_ipv4  ||= Interfaces.public_ipv4
         @private_ipv4 ||= Interfaces.internal_ipv4 except: ["127.0.0.1",@public_ipv4]
         @config         = TemplateConfig.new
         @config.etcd_discovery_id = @token

data/lib/teamd/installer/interfaces.rb

@@ -3,6 +3,9 @@ require "socket"
 module Teamd
   module Installer
     class Interfaces
+      CLASS_A = /(10)(\.([2][0-5][0-5]|[1][0-9][0-9]|[1-9][0-9]|[0-9])){3}/
+      CLASS_B = /(172)\.(1[6-9]|2[0-9]|3[0-1])(\.([2][0-5][0-5]|[1][0-9][0-9]|[1-9][0-9]|[0-9])){2}/
+      CLASS_C = /(192)\.(168)(\.([2][0-5][0-5]|[1][0-9][0-9]|[1-9][0-9]|[0-9])){2}/
       class << self
         def default_ipv4
           begin
@@ -15,7 +18,19 @@ module Teamd
             Socket.do_not_reverse_lookup = orig
           end
         end
+        def public_ipv4
+          address = default_ipv4
+          return address unless is_private? address
+          nil
+        end
+        def is_private? address
+          return true if address =~ CLASS_A
+          return true if address =~ CLASS_B
+          return true if address =~ CLASS_C
+          false
+        end
         def internal_ipv4 except:[]
+          except = except.compact
           Socket.getifaddrs.select do |ia|
             ia.addr.pfamily == Socket::AF_INET
           end.collect do |ia|

data/lib/teamd/installer/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Installer
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mathias Kaufmann