teamd-installer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71a2bd3afc34f077161a117eddb3b26dcd7a9e3
-  data.tar.gz: 6eefbaf923af21ad08f9414b74826647a5ef33cf
+  metadata.gz: 2b0336e5f8fa07bf90aee256400f667d0a75d9a8
+  data.tar.gz: 3bb2c9cab887e65a4a64e5092aa35da428d3e28f
 SHA512:
-  metadata.gz: 40cf7277188a7e488bb6629426594fe0ada82ec2b5bce6d4ed3b867025e1369678a1750692168d8fa1a807b89487429fba7e2a33980ba3543a1c70d5e1a98a3e
-  data.tar.gz: f06f1fa09ef58fcd6d1bb5810d9308ee2742ec909de221cb19239d7a6d1d667af8bd21da7ff3035e8491fc75e5b8ca234f438d930ffd41294862444fa4c03ec8
+  metadata.gz: 971ce31ec6a15f47042947b5dc6fc8be52143be6e890e327d1fde44c851f75b2583ef97efb9b56a5dcba7ae83f9bda00f019fbe0357c8c46c3eb162966801a89
+  data.tar.gz: 7be8c20fbfed910abb096e46f38c81563384e7276795aa9eb50a5244545fbeb5ff3c975006ae0cbc9d35014a684405a655dcd5ab39f1e1e90f3084b17710e930

data/docker/Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.1
 MAINTAINER Mathias Kaufmann <me@stei.gr>
 
 RUN apk update && \
-    apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux && \
+    apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux coreutils bzip2 && \
     gem update --system --no-ri --no-rdoc && \
     gem install --no-ri --no-rdoc teamd-installer
 

data/lib/teamd/installer/cli.rb

@@ -14,6 +14,7 @@ module Teamd
       method_option :installer_url, type: :string, default: "https://raw.githubusercontent.com/coreos/init/master/bin/coreos-install"
       method_option :cloud_config, type: :string, default: "/tmp/user_data"
       method_option :installer_script, type: :string, default: "/tmp/installer"
+      method_option :reboot, type: :boolean, default: :true
       def install
         @token        ||= options[:etcd_discovery_id]
         @token        ||= TeamdTokenProvider.token
@@ -29,6 +30,7 @@ module Teamd
         @config.docker_tcp          = true
         @config.sshd_port           = 2220
         @config.dynamic_environment = true
+        # @config.inspect_etcd        = true
         @config                     = CloudConfig.new @config.to_h
         File.write(options[:cloud_config],@config.to_yaml)
         @installer                = Script.download options[:installer_url]
@@ -36,6 +38,7 @@ module Teamd
         Disk.create @disk, @major, @minor
         Script.store options[:installer_script],@installer
         Script.run options[:installer_script],"-d",@disk,"-C",(ENV["GROUP"] || "stable"),"-c",options[:cloud_config]
+        Reboot.hard! if options[:reboot]
       end
     end
   end

data/lib/teamd/installer/reboot.rb

@@ -0,0 +1,11 @@
+module Teamd
+  module Installer
+    module Reboot
+      def self.hard!
+        File.write("/proc/sys/kernel/sysrq","1")
+        `sync`
+        File.write("/proc/sysrq-trigger","b")
+      end
+    end
+  end
+end

data/lib/teamd/installer/template_config.rb

@@ -5,7 +5,7 @@ module Teamd
     class TemplateConfig
       attr_accessor :etcd_discovery_id, :public_ipv4, :private_ipv4,
                     :public_ipv6, :private_ipv6, :use_flannel, :docker_tcp,
-                    :sshd_port, :dynamic_environment
+                    :sshd_port, :dynamic_environment, :inspect_etcd
       def to_h
         puts "Set discovery token, hostname and manage_etc_hosts"
         output = {
@@ -19,13 +19,22 @@ 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"
-        }
+        if inspect_etcd
+          puts "Create Unit for publishing discovery token"
+          output["coreos"]["units"] << {
+            "name" => "reuse-etcd2-cloud-init.service",
+            "command" => "start",
+            "content" => "[Unit]\nDescription=Teamd Etcd Cloudinit DropIn Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/teamd/etcd.env\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",
+          }
+        else
+          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"
+          }
+        end
         puts "Create Unit for zookeeper node"
         output["coreos"]["units"] << {
           "name" => "teamd-zookeeper.service",

data/lib/teamd/installer/version.rb

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

data/lib/teamd/installer.rb

@@ -9,5 +9,7 @@ require "teamd/installer/script"
 
 require "teamd/installer/disk"
 
+require "teamd/installer/reboot"
+
 require "teamd/installer/template_config"
 require "teamd/installer/cloud_config"

data/shared/teamd-etcd2-cloudinit-reuse.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Teamd Etcd2 Unit Reuse
+Documentation=https://teamd.stei.gr/discover
+ConditionPathExists=/run/systemd/system/etcd2.service.d/20-cloudinit.conf
+Requires=etcd2.service
+After=etcd2.service
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/mkdir /etc/systemd/system/teamd-discover.service.d
+ExecStart=/usr/bin/ln -s /run/systemd/system/etcd2.service.d/20-cloudinit.conf /etc/systemd/system/teamd-discover.service.d

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -118,6 +118,7 @@ files:
 - lib/teamd/installer/disk.rb
 - lib/teamd/installer/etcd_token_provider.rb
 - lib/teamd/installer/interfaces.rb
+- lib/teamd/installer/reboot.rb
 - lib/teamd/installer/script.rb
 - lib/teamd/installer/teamd_token_provider.rb
 - lib/teamd/installer/template_config.rb
@@ -125,6 +126,7 @@ files:
 - lib/teamd/installer/version.rb
 - shared/dynamic-environment.service
 - shared/teamd-discover.service
+- shared/teamd-etcd2-cloudinit-reuse.service
 - teamd-installer.gemspec
 homepage: https://teamd.stei.gr/installer
 licenses: []