teamd-installer 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 822755aa8e6d57c9d4588ff8063dcdbd4a6c9ea6
-  data.tar.gz: 9025f1ee8217d95721891a735a0832278406d678
+  metadata.gz: b560c3202d3b69f0062d285d1d6b9e7238f8f7fa
+  data.tar.gz: 8631fa83bb302b90448c0c7aabd3a0032931b623
 SHA512:
-  metadata.gz: a13481fa1eedf51879a75c5db9719fe126ca570bb73e727d1c955625c2951298c3a5bfc0ae8b0d8d27391b665fd850a1102464385da69104182759762b1541a0
-  data.tar.gz: 1c5c3038309b042e602d0af76cfb0fe2ab75bf5405d51ae74abe3148f4b1a436e58d8938d5474c8e297ebad122a96d3750904a439b8be6530b5428acdca9ca66
+  metadata.gz: 898b05ed9f8a2d9c83564486053ce33756bbcdf58557b0214d6ccacc2d609d8ad8c7c4187a891d3b2bf0837ccd066683dfe788cbce872da8d16f8f48c44e40f8
+  data.tar.gz: 0f7c0c168267dc921f1cfd89f27bcce46fa691f74da51ab247e3cd3209e6a37a46252e92fb8eba4d547ed50c545530ad298d76c15977b1f043cbb58fbf26f154

data/lib/teamd/installer/template_config.rb

@@ -26,14 +26,14 @@ module Teamd
         if inspect_etcd
           puts "Create Unit for publishing discovery token"
           output["coreos"]["units"] << {
-            "name" => "teamd-etcd-cloudinit-reuse.service",
+            "name" => "teamd-cloudinit-etcd.service",
             "command" => "start",
-            "content" => "[Unit]\nDescription=Teamd Etcd Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd.service.d\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd.service.d /etc/systemd/system/teamd-discover.service.d",
+            "conetnt" => Unit.insert("teamd-cloudinit-etcd.service"),
           }
           output["coreos"]["units"] << {
-            "name" => "teamd-etcd2-cloudinit-reuse.service",
+            "name" => "teamd-cloudinit-etcd2.service",
             "command" => "start",
-            "content" => "[Unit]\nDescription=Teamd Etcd2 Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd2.service.d\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd2.service.d /etc/systemd/system/teamd-discover.service.d",
+            "content" => Unit.insert("teamd-cloudinit-etcd2.service"),
           }
         else
           puts "Create Unit for publishing discovery token"
@@ -49,7 +49,7 @@ module Teamd
         output["coreos"]["units"] << {
           "name" => "teamd-discover.service",
           "command" => "start",
-          "content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nAfter=early-docker.service\nRequires=early-docker.service\nBefore=early-docker.target\n\n[Service]\nRestart=always\nRestartSec=5\nEnvironment=\"DOCKER_HOST=unix:///var/run/early-docker.sock\"\nEnvironmentFile=-/run/teamd/etcd.env\nExecStartPre=/usr/bin/docker pull steigr/teamd-discover\nExecStart=/usr/bin/docker run -t --rm --net=host \\\n --env=\"ETCD_DISCOVERY=${ETCD_DISCOVERY}\" \\\n  steigr/teamd-discover",
+          "content" => Unit.insert("teamd-discover.service"),
         }
         puts "Start Etcd2 at startup"
         output["coreos"]["units"] << {
@@ -63,8 +63,8 @@ module Teamd
         }
         puts "Adding SSH-Public-Key from proc command line"
         output["ssh_authorized_keys"] = [
-          File.read("/proc/cmdline").scan(/sshkey="([^"]+)"/).first.first
-        ]
+          (File.read("/proc/cmdline").scan(/sshkey="([^"]+)"/).first.first rescue nil)
+        ].compact
         if @sshd_port
           puts "Move SSHd out of the way (#{@sshd_port})"
           output["coreos"]["units"] << {
@@ -74,7 +74,7 @@ module Teamd
           }
           output["coreos"]["units"] << {
             "name" => "remove-sshd-socket.service",
-            "content" => "[Unit]\nDescription=Remove SSHd Socket before reboot\nBefore=shutdown.target reboot.target halt.target\nDefaultDependencies=no\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/rm /etc/systemd/system/sshd.socket",
+            "content" => Unit.insert("remove-sshd-socket.service"),
           }
         end
         unless @dynamic_environment
@@ -96,7 +96,7 @@ module Teamd
           output["coreos"]["units"] << {
             "name" => "dynamic-environment.service",
             "command" => "start",
-            "content" => "[Unit]\nDescription=Teamd Dynamic Environment File\nDocumentation=https://teamd.stei.gr/environment\nAfter=network-online.target\nBefore=etcd.service etcd2.service\n\n[Service]\nType=oneshot\nExecStart=/bin/sh -c 'a(){ ip -f inet -4 -o addr | grep -v -e \": lo\" -e  \": docker\" -e \": flannel\" | awk \"{print \\$4}\" | cut -f1 -d/ | $1 -1;}; echo -n COREOS_PRIVATE_IPV4= > /tmp/ip_env; a tail >> /tmp/ip_env; grep $(a head) /tmp/ip_env >/dev/null || (echo -n COREOS_PUBLIC_IPV4= >> /tmp/ip_env; a head >> /tmp/ip_env); cat /etc/environment 2>/dev/null | grep -v -e COREOS_PUBLIC_IPV4= -e COREOS_PRIVATE_IPV4= >> /tmp/ip_env; cat /tmp/ip_env > /etc/environment'",
+            "content" => Unit.insert("dynamic-environment.service"),
           }
         end
         if @use_flannel
@@ -116,7 +116,7 @@ module Teamd
             "name" => "docker-tcp.socket",
             "command" => "start",
             "enable" => true,
-            "content" => "[Unit]\nDescription=Docker Socket for the API\n[Socket]\nListenStream=2375\nBindIPv6Only=both\nService=docker.service\n\n[Install]\nWantedBy=sockets.target"
+            "content" => Unit.insert("docker-tcp.socket")
           }
         end
         output

data/lib/teamd/installer/unit.rb

@@ -0,0 +1,9 @@
+module Teamd
+  module Installer
+    class Unit
+      def self.insert name
+        File.read File.expand_path File.join(File.expand_path(__FILE__), "..","..","..","..","shared",name)
+      end
+    end
+  end
+end

data/lib/teamd/installer/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Installer
-    VERSION = "0.0.25"
+    VERSION = "0.0.26"
   end
 end

data/lib/teamd/installer.rb

@@ -11,5 +11,6 @@ require "teamd/installer/disk"
 
 require "teamd/installer/reboot"
 
+require "teamd/installer/unit"
 require "teamd/installer/template_config"
 require "teamd/installer/cloud_config"

data/shared/docker-tcp.socket

@@ -0,0 +1,9 @@
+[Unit]
+Description=Docker Socket for the API
+[Socket]
+ListenStream=2375
+BindIPv6Only=both
+Service=docker.service
+
+[Install]
+WantedBy=sockets.target

data/shared/remove-sshd-socket.service

@@ -1,8 +1,10 @@
 [Unit]
 Description=Remove SSHd Socket before reboot
-Before=shutdown.target reboot.target halt.target
 DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/rm /etc/systemd/system/sshd.socket
+ExecStart=/usr/bin/rm /etc/systemd/system/sshd.socket
+
+[Install]
+WantedBy=shutdown.target reboot.target halt.target

data/shared/{teamd-etcd2-cloudinit-reuse.service → teamd-cloudinit-etcd.service}

@@ -2,8 +2,6 @@
 Description=Teamd Etcd2 Unit Reuse
 Documentation=https://teamd.stei.gr/discover
 ConditionPathExists=/run/systemd/system/etcd2.service.d
-Requires=etcd2.service
-After=etcd2.service
 
 [Service]
 Type=oneshot

data/shared/teamd-cloudinit-etcd2.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Teamd Etcd Unit Reuse
+Documentation=https://teamd.stei.gr/discover
+ConditionPathExists=/run/systemd/system/etcd.service.d
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ln -s /run/systemd/system/etcd.service.d /etc/systemd/system/teamd-discover.service.d

data/shared/teamd-discover.service

@@ -1,15 +1,16 @@
 [Unit]
 Description=Teamd Local Discover Publisher
 Documentation=https://teamd.stei.gr/discover
-ConditionPathExists=/run/teamd/etcd.env
+After=early-docker.service
 Requires=early-docker.service
-After=etcd.service etcd2.service early-docker.service
 Before=early-docker.target
 
 [Service]
 Restart=always
 RestartSec=5
 Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
-ExecStart=/usr/bin/docker run --net=host --privileged=true --rm \
-  --env-file=/run/teamd/etcd.env \
-  registry.hub.docker.com/steigr/teamd-discover
+EnvironmentFile=-/run/teamd/etcd.env
+ExecStartPre=/usr/bin/docker pull steigr/teamd-discover
+ExecStart=/usr/bin/docker run -t --rm --net=host \
+ --env="ETCD_DISCOVERY=${ETCD_DISCOVERY}" \
+  steigr/teamd-discover

data/teamd-installer.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Discovers local cluster ID, build coreos-cloudinit file and install CoreOS to disk.}
   spec.homepage      = "https://teamd.stei.gr/installer"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|docker)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -110,7 +110,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- docker/Dockerfile
 - exe/teamd-installer
 - lib/teamd/installer.rb
 - lib/teamd/installer/cli.rb
@@ -123,11 +122,14 @@ files:
 - lib/teamd/installer/teamd_token_provider.rb
 - lib/teamd/installer/template_config.rb
 - lib/teamd/installer/token_provider.rb
+- lib/teamd/installer/unit.rb
 - lib/teamd/installer/version.rb
+- shared/docker-tcp.socket
 - shared/dynamic-environment.service
 - shared/remove-sshd-socket.service
+- shared/teamd-cloudinit-etcd.service
+- shared/teamd-cloudinit-etcd2.service
 - shared/teamd-discover.service
-- shared/teamd-etcd2-cloudinit-reuse.service
 - teamd-installer.gemspec
 homepage: https://teamd.stei.gr/installer
 licenses: []

data/docker/Dockerfile

@@ -1,9 +0,0 @@
-FROM steigr/teamd-ruby
-MAINTAINER Mathias Kaufmann <me@stei.gr>
-
-RUN apk update && \
-    apk add bash wget gnupg util-linux coreutils bzip2 && \
-    gem update --system --no-ri --no-rdoc
-RUN gem install --no-ri --no-rdoc --version 0.0.25 teamd-installer
-
-ENTRYPOINT ["/usr/bin/teamd-installer"]