teamd-installer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd920c171bede1f620e2c50bb26bdda1fd0b466
-  data.tar.gz: d1fce94e865befdedad145304a6f2271d175cf00
+  metadata.gz: ad4fdd931333d11aeecfbb8b21f010da15b54bbc
+  data.tar.gz: e51a1b288632021afeec890f22f77e6cfa120fed
 SHA512:
-  metadata.gz: ba90d8f7e64d1850965d7b854e8fa2f3556c98614538dcc005941650951969fccd7fecb5ab0ab5feb1fdf035f7ea929f6b76681d449453bf1f2d3affe0d31df9
-  data.tar.gz: 483a66985b78aa7ab3e3b3e45953fcb072677db007faf5b582b9b49cfd70d008a9ee974b86e72e3ce8a6adbac2659d3eebaadaf185eb26bbb1eda535ff0cb3ba
+  metadata.gz: 4c2e3166245028613aee61f7290a8d73e0a55a649db6288ca6ac6ef33cb8b57b9f77e650c32e9acc8b13a448ac33d7ddcd48f479d22bf3ae05e293a3025c52ec
+  data.tar.gz: 284dd02fee1356f31f6df916ef11d5875ed729ce0b161e57761f6393678019f9b35ced80ead1cb5989639b732b18ed1a163e4ff36602099fca1b4910cc16b424

data/lib/teamd/installer/cli.rb

@@ -21,13 +21,14 @@ module Teamd
         @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                   = CloudConfig.new @config.to_h
+        @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                     = CloudConfig.new @config.to_h
         File.write(options[:cloud_config],@config.to_yaml)
         @installer                = Script.download options[:installer_url]
         @disk,@major,@minor       = Disk.default

data/lib/teamd/installer/template_config.rb

@@ -3,7 +3,9 @@ require "securerandom"
 module Teamd
   module Installer
     class TemplateConfig
-      attr_accessor :etcd_discovery_id, :public_ipv4, :private_ipv4, :public_ipv6, :private_ipv6, :use_flannel, :docker_tcp, :sshd_port
+      attr_accessor :etcd_discovery_id, :public_ipv4, :private_ipv4,
+                    :public_ipv6, :private_ipv6, :use_flannel, :docker_tcp,
+                    :sshd_port, :dynamic_environment
       def to_h
         output = {
           "coreos" => {
@@ -41,15 +43,23 @@ module Teamd
             "content" => "[Socket]\nListenStream=#{@sshd_port}\nAccept=yes",
           }
         end
-        if @public_ipv4 or @private_ipv4
-          content = ""
-          content << "COREOS_PUBLIC_IPV4=#{@public_ipv4}\n" if @public_ipv4
-          content << "COREOS_PRIVATE_IPV4=#{@private_ipv4}\n" if @private_ipv4
-          output["write_files"] << {
-            "path" => "/etc/environment",
-            "permissions" => "0444",
-            "owner" => "root",
-            "content" => content
+        unless @dynamic_environment
+          if @public_ipv4 or @private_ipv4
+            content = ""
+            content << "COREOS_PUBLIC_IPV4=#{@public_ipv4}\n" if @public_ipv4
+            content << "COREOS_PRIVATE_IPV4=#{@private_ipv4}\n" if @private_ipv4
+            output["write_files"] << {
+              "path" => "/etc/environment",
+              "permissions" => "0444",
+              "owner" => "root",
+              "content" => content
+            }
+          end
+        else
+          output["coreos"]["units"] << {
+            "name" => "dynamic-environment.service",
+            "command" => "start",
+            "content" => "[Unit]\nDescription=Teamd Dynamic Environment File\nDocumentation=https://teamd.stei.gr/environment\nRequires=network-online.target\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 || (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)'",
           }
         end
         if @use_flannel

data/lib/teamd/installer/version.rb

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

data/shared/dynamic-environment.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Teamd Dynamic Environment File
+Documentation=https://teamd.stei.gr/environment
+Requires=network-online.target
+After=network-online.target
+Before=etcd.service etcd2.service
+
+[Service]
+Type=oneshot
+ExecStart=/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 || (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)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -123,6 +123,7 @@ files:
 - lib/teamd/installer/template_config.rb
 - lib/teamd/installer/token_provider.rb
 - lib/teamd/installer/version.rb
+- shared/dynamic-environment.service
 - shared/teamd-discover.service
 - teamd-installer.gemspec
 homepage: https://teamd.stei.gr/installer