kontena-plugin-vagrant 0.2.0.pre2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDQzN2Q5NjA0YTY4YzAyYTdhN2U0OGE0ZWNmMzlmOTE2YTNmNWMyYQ==
+    NDQ5ZTgzOTQ3MjhjNDVhZjU1YWQ1NzZkMjYwMDVhMDc5NDQzMjhjNw==
   data.tar.gz: !binary |-
-    ZGY0YWY4NmYwYmNhMWUyMWRlNmRiNWQ5Yjc3NjcwYWE2ZmJhNTFhZA==
+    ZDlmZWE5MjE4NGJkNzY1MDRjMDkxZDYzMTdkOWMwZTdlYjdkOWU4Ng==
 SHA512:
   metadata.gz: !binary |-
-    MDgzOWNiZWNmOTYyMGMyYjU2ZTAzMTE0MmExMDJhYmNkMmUxNDMxZjZhOGNk
-    N2ZhZmFmODgzYjQ0MWViYjUyMjNkZGU2NDQ2ODJjYTM1MzE4NjcxMTI3NGE5
-    NTJlMDc3NjIyMWM4ZWYwNDJjNmEyODc3YjUwYjVhOWM4OTQ1OTQ=
+    MzIyNzY5ZDM3ZTgwOGM1ZTRlYzFhNWM3ZDBhM2M4MTgzMzI3N2VlZTYwMTgx
+    MDdlYzc3ODRjNjFlN2EzYWU2OTM1MmUzMzU4MTE4ODY1NzBlNmE5Yzg5NzM2
+    MDM1ZWMxYTk1YzQwNzk1YmM2ZTNjYjU2MTI5NjczNzhjYjViYTA=
   data.tar.gz: !binary |-
-    Nzg0MDY4NGU5ZTU4MjU5YmQ1ZWI2NTFkYWZkNzg4MmM0NzNhYTcwNjM5NmYz
-    YmJhNWNiZWE1Y2NkYThiMzE5N2MzOGM2ZDE0NmM3NmQ3Mjg1OWQxNzRiZjFi
-    YzU4NjRhMDZiNTY5MTdkNzBlNTYxZTlkMGI2Njg5MTY5YWU5MGU=
+    NGViZTMwZTEzZWU3YTJlY2NiZTE0YTkzNGFkM2NjMmUwZDc0YmJlNzVkZGIy
+    NDgxMjlmMGZlYzMxNWM4ZGJhMDRjZmY4ZmNkMThiZDkzZmJlY2IwMjBmMmU0
+    NGQzMGMwNDQ1Y2MxYWE2ZTIwYjBiNzg5YjA1MDhkYTI5MGEyMmQ=

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

@@ -35,7 +35,16 @@ coreos:
         DOMAINS=kontena.local
         [DHCP]
         UseDNS=false
-
+    - name: etcd2.service
+      command: start
+      enable: true
+      content: |
+        Description=etcd 2.0
+        After=docker.service
+        [Service]
+        Restart=always
+        RestartSec=5
+        ExecStart=/usr/bin/docker logs --tail=10 -f kontena-etcd
     - name: 10-weave.network
       runtime: false
       content: |

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

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
+require 'json'
 
 module Kontena
   module Machine
@@ -64,11 +65,19 @@ module Kontena
           spinner "Waiting for #{name.colorize(:cyan)} to start " do
             sleep 1 until master_running?
           end
-          vspinner "Kontena Master is now running at #{API_URL}"
+
+          master_version = nil
+          spinner "Retrieving Kontena Master version" do
+            master_version = JSON.parse(client.get(path: '/'))["version"] rescue nil
+          end
+
+          spinner "Kontena Master #{master_version} is now running at #{API_URL}"
 
           {
             name: name.sub('kontena-master-', ''),
             public_ip: API_URL.split('//').last,
+            provider: 'vagrant',
+            version: master_version,
             code: opts[:initial_admin_code]
           }
         end

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

@@ -51,7 +51,7 @@ module Kontena
                 end
               end
             end
-            spinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
+            spinner "Waiting for node #{name.colorize(:cyan)} to join grid #{grid.colorize(:cyan)} " do
               sleep 1 until node = node_exists_in_grid?(grid, name)
             end
           end

data/lib/kontena/plugin/vagrant.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Vagrant
-      VERSION = "0.2.0.pre2"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.2.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5