teamd-installer 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e877c1e503b9cb269582b73de707b444f7e43518
-  data.tar.gz: 74b3b2948fbd3cfd28b1c41301c66ff68b2b3d4e
+  metadata.gz: 8805f3dd483cb85318727c66e27ef95c3a1edf2b
+  data.tar.gz: 50eafddec322664555e0b86ee90680b7b25cfce9
 SHA512:
-  metadata.gz: 660a47fa94eeb37c561895baeb111c7f2ffff84358cf9ee1709f0cb865d96654a5e8fc435a1c6cac7ca04e8feafd8a6bff935b4e6091400a10a92561c8a7986a
-  data.tar.gz: 92cbc2b0a5958df26438164e4d5f28669b57714a8b6a70fbba7df9de0d9e6589b91fe5101362df37c5795ab1a472c82289ea837918e48748246d58f501c3eb83
+  metadata.gz: 1106366f3c3d73e096f75eab66f9fd6240b389d4533e737a9361a037c2e435e9bb740d6064453103b2a786bfaaaecd997f686f27f1ea94aecc08b8731871f441
+  data.tar.gz: 8444a22d4030a5b6af422028d6b6de4c3535b965f8e83e6a8b1bbb6e4f3820e312363fdec37f0f6e9a3f229156814bbe61cf57120417c85d20175acd7bb3ebee

data/docker/Dockerfile

@@ -4,6 +4,6 @@ MAINTAINER Mathias Kaufmann <me@stei.gr>
 RUN apk update && \
     apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux coreutils bzip2 && \
     gem update --system --no-ri --no-rdoc
-RUN gem install --no-ri --no-rdoc --version 0.0.18 teamd-installer
+RUN gem install --no-ri --no-rdoc --version 0.0.20 teamd-installer
 
 ENTRYPOINT ["/usr/bin/teamd-installer"]

data/lib/teamd/installer/template_config.rb

@@ -42,6 +42,11 @@ module Teamd
           "command" => "start",
           "content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nAfter=docker.service\nRequires=docker.service\n\n[Service]\nRestart=always\nRestartSec=5\nEnvironmentFile-=\"/run/teamd/etcd.env\"\nExecStart=/usr/bin/docker run --rm --net=host \\\n --env=\"ETCD_DISCOVERY=${ETCD_DISCOVERY}\" \\\n  registry.hub.docker.com/steigr/teamd-discover",
         }
+        puts "Start Etcd2 at startup"
+        output["coreos"]["units"] << {
+          "name" => "etcd2.service",
+          "command" => "start"
+        }
         puts "Start Docker at startup"
         output["coreos"]["units"] << {
           "name" => "docker.service",
@@ -83,7 +88,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\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)'",
+            "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 || (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.18"
+    VERSION = "0.0.20"
   end
 end

metadata

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