teamd-installer 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732e7baec34878768c63eff297d8ea0832ed712a
-  data.tar.gz: a7e8bde62b4ac750b0f02e6f508cf21281a2fa22
+  metadata.gz: 822755aa8e6d57c9d4588ff8063dcdbd4a6c9ea6
+  data.tar.gz: 9025f1ee8217d95721891a735a0832278406d678
 SHA512:
-  metadata.gz: 899e9fba22504d13c77ee30a0221eaa92f8a165d57f4c3295d42970790b070aec50ac34d4a1f1b08b98b392f9294d22da4799a72614b78a8d06394bbc05c2e91
-  data.tar.gz: 38b674b68d33490994a9aff4c67acd062139d2a486c1358c533757f999f79255e95cd2f775ea5d29b0776fd8da92ebb05de6df4316efb14bcae960815e3a9b46
+  metadata.gz: a13481fa1eedf51879a75c5db9719fe126ca570bb73e727d1c955625c2951298c3a5bfc0ae8b0d8d27391b665fd850a1102464385da69104182759762b1541a0
+  data.tar.gz: 1c5c3038309b042e602d0af76cfb0fe2ab75bf5405d51ae74abe3148f4b1a436e58d8938d5474c8e297ebad122a96d3750904a439b8be6530b5428acdca9ca66

data/docker/Dockerfile

@@ -4,6 +4,6 @@ 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.24 teamd-installer
+RUN gem install --no-ri --no-rdoc --version 0.0.25 teamd-installer
 
 ENTRYPOINT ["/usr/bin/teamd-installer"]

data/lib/teamd/installer/template_config.rb

@@ -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 || (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 >/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'",
           }
         end
         if @use_flannel

data/lib/teamd/installer/version.rb

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

data/shared/dynamic-environment.service

@@ -1,10 +1,9 @@
 [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)'
+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 >/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'

metadata

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