teamd-installer 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb8c0bb401c364936797d4af441b8db7b2ed280
-  data.tar.gz: c0458f5c89149aa506642933dd08ffd3bbace20a
+  metadata.gz: da9d128870b271dd4468c613d757919b9fd87caa
+  data.tar.gz: 59992ecaccf528714d9f3e027428d2fd325b3ae8
 SHA512:
-  metadata.gz: 991b1645aa4f4939624ad89fb5e4b2a0045907456d4e2ee8fbb91cf439035ed825f144a88c4c2c9a00bffcd391f25c2e12f9d8f3cc53255fe0fd5234c7c72883
-  data.tar.gz: 546006c2e687572e1c82b0dafb6969b07384bb80c11cf6b386649056c2adbc57418f8e0c5bfc77447f73243e0cfbda8cfde9c9197b387a5a533683495906392e
+  metadata.gz: e524b3bf22725f49458b0b939513fc5995aa730ec4bfd88760861c039ed510b4135890455a5673cfcaf49c2458b6608324f9870043c9044ae13da5e7b765f38a
+  data.tar.gz: dd162be6747862747852ed44719a5655e3c9a39780771c6e2744413d91a9031c08fd58153a20e6d523cd2750c01798686d8c6414e2abb31f01f531e7f4809c55

data/lib/teamd/installer/cli.rb

@@ -6,23 +6,23 @@ module Teamd
     class Cli < Thor
       class << self
         def build_cloud_config options
-          @token        ||= options[:etcd_discovery_id]
-          @token        ||= TeamdTokenProvider.token
-          @token        ||= EtcdTokenProvider.token
-          puts "Using Token #{@token}"
-          @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
-          @config.public_ipv4         = @public_ipv4
-          @config.private_ipv4        = @private_ipv4
-          @config.use_flannel         = true
-          @config.docker_tcp          = true
-          @config.sshd_port           = 2220
-          @config.dynamic_environment = true
-          @config.inspect_etcd        = true
-          @config.flannel_network     = "10.10.0.0/16"
-          @config                     = CloudConfig.new @config.to_h
+          @token                     ||= options[:etcd_discovery_id]
+          @token                     ||= TeamdTokenProvider.token
+          @token                     ||= EtcdTokenProvider.token
+          @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
+          @config.public_ipv4          = @public_ipv4
+          @config.private_ipv4         = @private_ipv4
+          @config.use_flannel          = true
+          @config.docker_tcp           = true
+          @config.sshd_port            = 2220
+          @config.dynamic_environment  = true
+          @config.inspect_etcd         = true
+          @config.flannel_network      = "10.10.0.0/16"
+          @config.flannel_backend_type = "vxlan"
+          @config                      = CloudConfig.new @config.to_h
           File.write(options[:cloud_config],@config.to_yaml)
         end
         def build_install_command options

data/lib/teamd/installer/etcd_token_provider.rb

@@ -6,7 +6,9 @@ module Teamd
     class EtcdTokenProvider < TokenProvider
       PROVIDER_URL = "https://discovery.etcd.io/new?size=1"
       def self.token
-        URI(open(PROVIDER_URL).read).path[1..-1]
+        token = URI(open(PROVIDER_URL).read).path[1..-1]
+        puts "Use Etcd-Discovery-Token #{token}"
+        token
       end
     end
   end

data/lib/teamd/installer/teamd_token_provider.rb

@@ -5,7 +5,9 @@ module Teamd
   module Installer
     class TeamdTokenProvider < TokenProvider
       def self.token
-        Teamd::Discover.discover
+        token = Teamd::Discover.discover
+        puts "Use Teamd-Token #{token}"
+        token
       end
     end
   end

data/lib/teamd/installer/template_config.rb

@@ -6,7 +6,7 @@ module Teamd
       attr_accessor :etcd_discovery_id, :public_ipv4, :private_ipv4,
                     :public_ipv6, :private_ipv6, :use_flannel, :docker_tcp,
                     :sshd_port, :dynamic_environment, :inspect_etcd,
-                    :flannel_network
+                    :flannel_network, :flannel_backend_type
       def to_h
         puts "Set discovery token, hostname and manage_etc_hosts"
         output = {
@@ -15,7 +15,7 @@ module Teamd
               "discovery" => "https://discovery.etcd.io/#{@etcd_discovery_id}",
               "advertise-client-urls" => "http://$private_ipv4:2379",
               "initial-advertise-peer-urls" => "http://$private_ipv4:2380",
-              "listen-client-urls" => "http://0.0.0.0:2379,http://0.0.0.0:4001",
+              "listen-client-urls" => "http://$private_ipv4:2379,http://$private_ipv4:4001",
               "listen-peer-urls" => "http://$private_ipv4:2380,http://$private_ipv4:7001",
             },
             "units" => [],
@@ -106,7 +106,7 @@ module Teamd
             "command" => "start",
             "drop-ins" => [
               "name" => "50-network-config.conf",
-              "content" => "[Service]\nExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{ \"Network\": \"#{@flannel_network}\" }'",
+              "content" => "[Service]\nExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{ \"Network\": \"#{@flannel_network}\",\"Backend\":{\"Type\":\"#{@flannel_backend_type}\"} }'",
             ],
           }
         end

data/lib/teamd/installer/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Installer
-    VERSION = "0.0.28"
+    VERSION = "0.0.29"
   end
 end

metadata

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