kontena-plugin-azure 0.2.0.pre1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFjMDEyZmFhMzgzZGJhNDc0OWFlMjcyMzNlNGRmY2Q1ZmFhNGFlYw==
+    NDUzOWViOTQzYWU2ZDFkZmY4M2VmODU3NDliMTgyMzM3MWQzMDEzNA==
   data.tar.gz: !binary |-
-    MDRkOTk0YzNmYzg0ZTRhNDVlMDQwNTkzYzlkZGVmMDBlZGUwNzM1NQ==
+    NzM5YzI3ZjYyZGQyZTUyMjU3NjVjMThkZDUwNjE1NmFjYmJlOWQ2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MjgwMTJlZjliMzkxZjVmODdhYmEwYTgzZjRiZDlmNGRlYzJlNWQ3OTlhODY3
-    OTc2ZjIyMWI0YTg1YTUzY2E3ZmQzM2Y0NDcyOWMyNDllMDhiMDQ3YTdjMDZh
-    NzgyNGRhZmYwYThhNmI1ZWM5YjgxN2ZjZDlmZDg1YWU1MGVlZmY=
+    ZjE5MjdjZGM0NTBmZjVjNWM5YjUyZGMyMDk3MDAwOTdkZDRhYmJiM2Q2YTY0
+    NDQzMWFjODZkOThjYTBhMDBlNDJhYTA2MGRiMWI1ZjI5ZjNiMTA2NGQyZjY2
+    M2MyOGZmMzUxYmFhOTc5YWY3ZWI2NTM2N2I5MWI1Mjk3NjU1Njc=
   data.tar.gz: !binary |-
-    NjY0NTkyMGQwYTVkMWRlMjBlNDFhZjgzYjYyNzMxYzVlZTc5ZTRlZjkzMDEx
-    OTUwNDQ3MDJhYjU5NDY4N2U5NDhiMTE0NjM1ZGY5NmIzZjc0YmJlZDAwMWNl
-    ZTgzNDEzZTEzYjYyMGE5MzQ0YmFjMTE5NTI2ZGFkZmFjY2IwMGU=
+    NTIzNTc2MTgxOTdmYjEyYjBlYmUxOGMwOTg3ZDMwYjJjY2E1NDE0ZTg1NWU0
+    MzNjYjUzMWIxYWNlNWI5OTRjZDJjMWJlYzYzMWIwOTFhNGFkNTBlNGYyM2E2
+    Nzc4MWIxMjM2MTk2YTg2ZTgwZmQyODE1MTE5ODVlOGYzODYxYWQ=

data/lib/kontena/machine/azure/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/azure/cloudinit_master.yml

@@ -81,8 +81,8 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
-            <% if server_name %>-e KONTENA_SERVER_NAME=<%= server_name %><% end %> \
-            <% if initial_admin_code %>-e KONTENA_INITIAL_ADMIN_CODE=<%= intial_admin_code %><% end %> \
+            <% if server_name %>-e SERVER_NAME=<%= server_name %><% end %> \
+            <% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= intial_admin_code %><% end %> \
             kontena/server:${KONTENA_VERSION}
 
     - name: kontena-server-haproxy.service

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

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
+require 'json'
 
 module Kontena
   module Machine
@@ -32,7 +33,7 @@ module Kontena
           cloud_service_name = generate_cloud_service_name
           vm_name = cloud_service_name
           master_url = ''
-          spinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
+          spinner "Creating an Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
             if opts[:virtual_network].nil?
               location = opts[:location].downcase.gsub(' ', '-')
               default_network_name = "kontena-#{location}"
@@ -83,13 +84,18 @@ module Kontena
             sleep 0.5 until master_running?
           end
 
-          puts
-          puts "Kontena Master is now running at #{master_url}".colorize(:green)
-          puts
+          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}".colorize(:green)
 
           {
             name: opts[:name] || cloud_service_name.sub('kontena-master-', ''),
             public_ip: virtual_machine.ipaddress,
+            provider: 'azure',
+            version: master_version,
             code: opts[:initial_admin_code]
           }
         end

data/lib/kontena/plugin/azure/master/create_command.rb

@@ -39,7 +39,7 @@ module Kontena::Plugin::Azure::Master
     # @param [String] certificate
     # @return [Kontena::Machine::Azure::MasterProvisioner]
     def provisioner(subscription_id, certificate)
-      Kontena::Machine::Azure::MasterProvisioner.new
+      Kontena::Machine::Azure::MasterProvisioner.new subscription_id, certificate
     end
   end
 end

data/lib/kontena/plugin/azure/nodes/create_command.rb

@@ -40,7 +40,7 @@ module Kontena::Plugin::Azure::Nodes
     # @param [String] certificate
     # @return [Kontena::Machine::Azure::NodeProvisioner]
     def provisioner(client, subscription_id, certificate)
-      Kontena::Machine::Azure::NodeProvisioner.new
+      Kontena::Machine::Azure::NodeProvisioner.new client, subscription_id, certificate
     end
 
     # @return [Hash]

data/lib/kontena/plugin/azure.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Azure
-      VERSION = "0.2.0.pre1"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-azure
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -112,9 +112,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