kontena-plugin-vagrant 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM4MzJlOTNjZjUzMDNmMjM2YzM2OTliNDA2ZDhjNmYwOWE2YzJhZA==
+    ZDU5MzU3OGMzOGRiODNlNmExMzFlMDg2MmUwNjYzYWQxMzM1OGY1NQ==
   data.tar.gz: !binary |-
-    ZjMxYzAyNzEzOTE4OGU4MmRjZDA0YTY5ZjZmMWY1NTM5NDY3MDYyNg==
+    ZDJhMzRiOWUzNTM0MWI4NzE5MDQ5NDE2ZDQ0MDM2N2FkZmIyNTk1Yg==
 SHA512:
   metadata.gz: !binary |-
-    NjRhMDg5NzRmNzI5ZjgzNjg4NzY0YjBhZGVmMzM2NDQ2ZTFjMjQ3YzQ5MzFh
-    NTI3NmY1OTk5MGI0MWJlZWQ0OWMwM2EwODYyZjNlYmM2NmEzMDlmYzJjYjU1
-    NzgxNmRjNGUxZmVjOTM4MTg0YTNlNmNlOTlhYTlmZmYzN2JkNjc=
+    ODZiYTFkOTZjZWI0OGJlM2IzYmQ2OWZhMmI0YzVhMzZhMmY0YmY1MDk4MThh
+    M2RjZDhjZmQxZGEzMjZiN2QyZGFiMTNlNTJkOWRjZDNjODNhMDAwMWU5NGNh
+    N2Y5OWI1OWQzNzJmYTgzMjU2YjJiNDc2ZGQwZWZkOWNiZGM1OTI=
   data.tar.gz: !binary |-
-    NGVmN2M5NWFhZTFmYmNiMmU4MzJiYjc3MGQwNjRjZWQ1NTEwN2EwMDcyYTYw
-    MjZjZTk0MThlYTk2MTllYzUwNWEyYzU3ZTdkNTI4NGZhYzFmMWZhYjAyZWZm
-    OTVhMjkwY2ExODkzNGI2NjIxNzgxNjU0MGM3ZmQ2MDYxMWQ4Y2I=
+    ZTIyMzQwZjBlMDI4MWMzMmEyZjc3NjUwMTU1MzZmMTJlZDI1NzdjNDcwZTI1
+    MDJhM2Y1Mzk2MWQ3ZWQ0YThkYWIwODU5OGZlNDkzMmFiNTA1ZWMzOGY5ZjFi
+    ZmI4MTI5MjFmZTg4MzkyNDkzMzhiNzVlNDI4YzNmMjkxMGIwOWM=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.1.2 (2016-08-31)
+
+- add provider labeling for nodes (#4)
+- add ExecStop to systemd units (#2)
+
 # 0.1.1 (2016-08-10)
 
 - first release as a plugin

data/lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb

@@ -41,6 +41,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
             --volumes-from=kontena-server-mongo-data \
             mongo:3.0 mongod --smallfiles
+        ExecStop=/usr/bin/docker stop kontena-server-mongo
 
     - name: kontena-server-api.service
       command: start
@@ -71,6 +72,7 @@ coreos:
             <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
             -p 8080:9292 \
             kontena/server:${KONTENA_VERSION}
+        ExecStop=/usr/bin/docker stop kontena-server-api
 INIT
 
 cloud_init_file = Tempfile.new('kontena-master')

data/lib/kontena/machine/vagrant/cloudinit.yml

@@ -72,3 +72,4 @@ coreos:
             -v=/etc/kontena-agent.env:/etc/kontena.env \
             --net=host \
             kontena/agent:${KONTENA_VERSION}
+        ExecStop=/usr/bin/docker stop kontena-agent

data/lib/kontena/machine/vagrant/node_provisioner.rb

@@ -41,6 +41,7 @@ module Kontena
           cloudinit = erb(File.read(cloudinit_template), vars)
           File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
           File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          node = nil
           Dir.chdir(vagrant_path) do
             ShellSpinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
               Open3.popen2('vagrant up') do |stdin, output, wait|
@@ -50,9 +51,15 @@ module Kontena
               end
             end
             ShellSpinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
-              sleep 1 until node_exists_in_grid?(grid, name)
+              sleep 1 until node = node_exists_in_grid?(grid, name)
             end
           end
+          set_labels(
+            node,
+            [
+              "provider=vagrant"
+            ]
+          )
         end
 
         def generate_name
@@ -66,6 +73,11 @@ module Kontena
         def node_exists_in_grid?(grid, name)
           api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
         end
+
+        def set_labels(node, labels)
+          data = {labels: labels}
+          api_client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+        end
       end
     end
   end

data/lib/kontena/plugin/vagrant.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Vagrant
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli