kontena-plugin-upcloud 0.2.0.pre2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJkMTY1MThhNDQ4ZmUyMzI0NTE1NTJkZjFhNGVmNTQ1MjY4NjA5YQ==
+    NjY2ZmMzNjU2OWM2MjJjNjcyODAzNGY2ZWFlNWNjYTVkMWE0ZmNjZA==
   data.tar.gz: !binary |-
-    OWFhMWJkZWQyZmFlNTE5MmVkZTJiYTI3ZDYyYjE2M2JjYjEzZGIxMw==
+    ZWJiNjE5YjFiYjJiZWI1OGY2YWY2YWNiNTFmMGFkZWJjMTY4YTJiNA==
 SHA512:
   metadata.gz: !binary |-
-    ODNlNWQxOGNhMmQwNmI4MDhkMDkzMDBmNjJjYTYwN2ZiMDBkODg0ZGRjODVm
-    ZTM3OGNjYjE1NWQyYWMwMGMzMmNmYmViYjU1Y2MzZTY3YTIzM2I5NDMzZTQx
-    ZDY3ZTY4Njk0ZjRmOTkzNWIyOTE5YmJiMmE1MTliM2U3ZDA3MzA=
+    MTRjYzE2NzYxZjRmMzIxMGVkMWM2MTg0YTFiZTg4MTJkZGMyZjE4Njk2OGZi
+    ZWU5ZTYxNTQ3MzEwMTA5N2M2NGIyYWI3ODM0MTI4ZjRlYWFhNzNkNDQ5OTRj
+    MGQ3MTVhODhiYmNkMDMyZGQ3NGRlMzEwYjYyMTg1YzY5OTc4Nzk=
   data.tar.gz: !binary |-
-    NDM0NTdkN2MyYzhiNzgzNTBlMmE4MzI5YjcyODdiM2I5MTY3YmY2YTM0Njdm
-    YmRjNGRlNzIyYzJkMjVhOTRkY2RiOTNkMjQ1MTJlOTZlMTk1ZjdjY2I1NGEy
-    OWQ3NWI5ZmEyY2VlMDg5OWViZjU3OWQzN2VjZWZmZDUwYmZlZDc=
+    MWQ0ZTM3MjQ5ZGJkNTE2N2Y4NGFkYzZhMjFlOGJhMDAxZTEzYTRhN2Y5ZDg3
+    MDc4NDllYjA3YzM0NGIxOTM3NjYyMThmOTRiMDhjYjExOTMxYjFhZTM4OGMy
+    ZjVjODEzODUyNmQxNjkxNmEyOTRkMjk3ZjY2ZDZiNGM2ZGQ3ODI=

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

@@ -27,6 +27,16 @@ write_files:
       nameserver 8.8.4.4
 coreos:
   units:
+    - 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/upcloud/master_provisioner.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
+require 'json'
 
 module Kontena
   module Machine
@@ -30,7 +31,7 @@ module Kontena
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
             ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
           else
-            spinner "Generating self-signed SSL certificate" do
+            spinner "Generating a self-signed SSL certificate" do
               ssl_cert = generate_self_signed_cert
             end
           end
@@ -88,7 +89,7 @@ module Kontena
             }
           }.to_json
 
-          spinner "Creating Upcloud master #{hostname.colorize(:cyan)} " do
+          spinner "Creating an Upcloud server #{hostname.colorize(:cyan)} " do
             response = post('server', body: device_data)
             if response.has_key?(:error)
               abort("\nUpcloud server creation failed (#{response[:error].fetch(:error_message, '')})")
@@ -115,11 +116,18 @@ module Kontena
             sleep 1 until master_running?
           end
 
-          vfakespinner "Kontena Master is now running at #{master_url}"
+          master_version = nil
+          spinner "Retrieving Kontena Master version" do
+            master_version = JSON.parse(@http_client.get(path: '/').body)["version"] rescue nil
+          end
+
+          spinner "Kontena Master #{master_version} is now running at #{master_url}"
 
           {
             name: server_name,
             public_ip: device_public_ip[:address],
+            provider: 'upcloud',
+            version: master_version,
             code: opts[:initial_admin_code]
           }
         end

data/lib/kontena/plugin/upcloud.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 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-11 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -98,9 +98,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