teamd-installer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0336e5f8fa07bf90aee256400f667d0a75d9a8
-  data.tar.gz: 3bb2c9cab887e65a4a64e5092aa35da428d3e28f
+  metadata.gz: ded9fb87ebc538d5d1d8948d39f896a9c9c97f32
+  data.tar.gz: 5267354623480da5813f16d276da7dd4ee4179ac
 SHA512:
-  metadata.gz: 971ce31ec6a15f47042947b5dc6fc8be52143be6e890e327d1fde44c851f75b2583ef97efb9b56a5dcba7ae83f9bda00f019fbe0357c8c46c3eb162966801a89
-  data.tar.gz: 7be8c20fbfed910abb096e46f38c81563384e7276795aa9eb50a5244545fbeb5ff3c975006ae0cbc9d35014a684405a655dcd5ab39f1e1e90f3084b17710e930
+  metadata.gz: bf6a68bcb7b230601399606911b84b2a0203e14dae3844b434ea57d01df17459cb036936a1ba57d21c832091bf80e92cb734740d3c1e8970f96d969851d39de1
+  data.tar.gz: c7e541bd3f8bf98e0b870ea36088ca8cabf7180c3403679fa4abee036952d82a3b7ece820e645b37f71db2214b266c0a581bbe14d77dc22e2b3e63fe7bf3309c

data/lib/teamd/installer/template_config.rb

@@ -22,9 +22,9 @@ module Teamd
         if inspect_etcd
           puts "Create Unit for publishing discovery token"
           output["coreos"]["units"] << {
-            "name" => "reuse-etcd2-cloud-init.service",
+            "name" => "teamd-etcd2-cloudinit-reuse.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",
+            "content" => "[Unit]\nDescription=Teamd Etcd2 Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd2.service.d/20-cloudinit.conf\nRequires=etcd2.service\nAfter=etcd2.service\n\n[Service]\nType=oneshot\nExecStartPre=/usr/bin/mkdir /etc/systemd/system/teamd-discover.service.d\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd2.service.d/20-cloudinit.conf /etc/systemd/system/teamd-discover.service.d",
           }
         else
           puts "Create Unit for publishing discovery token"
@@ -35,11 +35,11 @@ module Teamd
             "content" => "ETCD_DISCOVERY=https://discovery.etcd.io/#{@etcd_discovery_id}\n"
           }
         end
-        puts "Create Unit for zookeeper node"
+        puts "Create Unit for discovery node"
         output["coreos"]["units"] << {
-          "name" => "teamd-zookeeper.service",
+          "name" => "teamd-discover.service",
           "command" => "start",
-          "content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/teamd/etcd.env\nRequires=early-docker.service\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",
+          "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 Docker at startup"
         output["coreos"]["units"] << {

data/lib/teamd/installer/version.rb

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

metadata

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