teamd-installer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4fdd931333d11aeecfbb8b21f010da15b54bbc
-  data.tar.gz: e51a1b288632021afeec890f22f77e6cfa120fed
+  metadata.gz: f71a2bd3afc34f077161a117eddb3b26dcd7a9e3
+  data.tar.gz: 6eefbaf923af21ad08f9414b74826647a5ef33cf
 SHA512:
-  metadata.gz: 4c2e3166245028613aee61f7290a8d73e0a55a649db6288ca6ac6ef33cb8b57b9f77e650c32e9acc8b13a448ac33d7ddcd48f479d22bf3ae05e293a3025c52ec
-  data.tar.gz: 284dd02fee1356f31f6df916ef11d5875ed729ce0b161e57761f6393678019f9b35ced80ead1cb5989639b732b18ed1a163e4ff36602099fca1b4910cc16b424
+  metadata.gz: 40cf7277188a7e488bb6629426594fe0ada82ec2b5bce6d4ed3b867025e1369678a1750692168d8fa1a807b89487429fba7e2a33980ba3543a1c70d5e1a98a3e
+  data.tar.gz: f06f1fa09ef58fcd6d1bb5810d9308ee2742ec909de221cb19239d7a6d1d667af8bd21da7ff3035e8491fc75e5b8ca234f438d930ffd41294862444fa4c03ec8

data/lib/teamd/installer/cli.rb

@@ -18,6 +18,7 @@ module Teamd
         @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

data/lib/teamd/installer/interfaces.rb

@@ -20,7 +20,10 @@ module Teamd
         end
         def public_ipv4
           address = default_ipv4
-          return address unless is_private? address
+          unless is_private? address
+            puts "Public IPv4 is #{address}"
+            return address
+          end
           nil
         end
         def is_private? address
@@ -31,13 +34,15 @@ module Teamd
         end
         def internal_ipv4 except:[]
           except = except.compact
-          Socket.getifaddrs.select do |ia|
+          address = Socket.getifaddrs.select do |ia|
             ia.addr.pfamily == Socket::AF_INET
           end.collect do |ia|
             ia.addr.ip_address
           end.reject do |ip|
             except.include? ip
           end.first
+          puts "Private IPv4 is #{address}"
+          address
         end
       end
     end

data/lib/teamd/installer/template_config.rb

@@ -7,6 +7,7 @@ module Teamd
                     :public_ipv6, :private_ipv6, :use_flannel, :docker_tcp,
                     :sshd_port, :dynamic_environment
       def to_h
+        puts "Set discovery token, hostname and manage_etc_hosts"
         output = {
           "coreos" => {
             "etcd" => { 
@@ -18,25 +19,30 @@ module Teamd
           "hostname" => SecureRandom.hex(8),
           "manage_etc_hosts" => "localhost",
         }
+        puts "Create Unit for publishing discovery token"
         output["write_files"] << {
           "path" => "/run/teamd/etcd.env",
           "permissions" => "0444",
           "owner" => "root",
           "content" => "ETCD_DISCOVERY=https://discovery.etcd.io/#{@etcd_discovery_id}\n"
         }
+        puts "Create Unit for zookeeper node"
         output["coreos"]["units"] << {
           "name" => "teamd-zookeeper.service",
           "command" => "start",
           "content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/teamd/etcd.env\nRequires=early-docker.service\nAfter=etcd.service etcd2.service early-docker.service\nBefore=early-docker.target\n\n[Service]\nRestart=always\nRestartSec=5\nEnvironment=\"DOCKER_HOST=unix:///var/run/early-docker.sock\"\nExecStart=/usr/bin/docker run --net=host --privileged=true --rm \\\n  --env-file=/run/teamd/etcd.env \\\n  registry.hub.docker.com/steigr/teamd-discover",
         }
+        puts "Start Docker at startup"
         output["coreos"]["units"] << {
           "name" => "docker.service",
           "command" => "start"
         }
+        puts "Adding SSH-Public-Key from proc command line"
         output["ssh_authorized_keys"] = [
           File.read("/proc/cmdline").scan(/sshkey="([^"]+)"/).first.first
         ]
         if @sshd_port
+          puts "Move SSHd out of the way (#{@sshd_port})"
           output["coreos"]["units"] << {
             "name" => "sshd.socket",
             "command" => "restart",
@@ -44,6 +50,7 @@ module Teamd
           }
         end
         unless @dynamic_environment
+          puts "Writing static /etc/environment"
           if @public_ipv4 or @private_ipv4
             content = ""
             content << "COREOS_PUBLIC_IPV4=#{@public_ipv4}\n" if @public_ipv4
@@ -56,6 +63,7 @@ module Teamd
             }
           end
         else
+          puts "Adding dynamic environment unit"
           output["coreos"]["units"] << {
             "name" => "dynamic-environment.service",
             "command" => "start",
@@ -63,12 +71,14 @@ module Teamd
           }
         end
         if @use_flannel
+          puts "Enable flannel"
           output["coreos"]["units"] << {
             "name" => "flanneld.service",
             "command" => "start"
           }
         end
         if @docker_tcp
+          puts "Bind Docker to TCP-Socket"
           output["coreos"]["units"] << {
             "name" => "docker-tcp.socket",
             "command" => "start",

data/lib/teamd/installer/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Installer
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -105,12 +105,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker/Dockerfile
 - exe/teamd-installer
 - lib/teamd/installer.rb
 - lib/teamd/installer/cli.rb