kontena-plugin-azure 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb0bae5a7d6c9367edd39c2bc9e1f582f7a1403
-  data.tar.gz: 97ea749df64bbd363f6a9342094494e219ed9612
+  metadata.gz: ed37995c9d3102552fd3191c64daa79c00a26e0d
+  data.tar.gz: 3b722e2faceac42808618b62af6fad7d332b36ee
 SHA512:
-  metadata.gz: 22803c8c155cccd5cf3461c346e9240c56b7ade8063aa57a148c0ab4849d200785f4562d6620016e2dda6727bc4c8389c4204507a413f01c78730e4631f8a3d7
-  data.tar.gz: 84b2a7e39bd0ad22288a973fc479e3b128afe0a3636c371639f749e99f58c7297a30324b42100b9530e887d4eb6cc9865b8c9cf6a56c1146eee92a8a12d97e04
+  metadata.gz: 6661770c294512dcce55ccc1c7f8287599950405c0a2ef387f5b93daf7840c338b699b381ad3f7995ca384e1d26e73d2e5d6d2fbe3ed554421acea88605101ec
+  data.tar.gz: e9c900a5deb4b288242ebf45c9322fd91320b8f398ff085d55a2b092650e857fda92bab1384ae3135474fd33d60dda9520d9ad671a533ddf08731288e5d8a382

data/kontena-plugin-azure.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kontena, Inc."]
   spec.email         = ["info@kontena.io"]
 
-  spec.summary       = "Kontena Azure plugin"
-  spec.description   = "Kontena Microsoft Azure plugin"
+  spec.summary       = "Kontena Azure (classic) plugin"
+  spec.description   = "Kontena Microsoft Azure (classic) plugin"
   spec.homepage      = "https://github.com/kontena/kontena-plugin-azure"
   spec.license       = "Apache-2.0"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'kontena-cli', '>= 1.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.0'
-  spec.add_runtime_dependency 'azure', '0.7.0'
+  spec.add_runtime_dependency 'azure', '0.7.7'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/kontena/machine/azure.rb

@@ -1,5 +1,6 @@
 require 'azure'
 require 'kontena/machine/random_name'
+require 'kontena/machine/cert_helper'
 require_relative 'azure/logger'
 require_relative 'azure/node_provisioner'
 require_relative 'azure/node_destroyer'

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

@@ -6,7 +6,7 @@ write_files:
     content: |
       KONTENA_URI="<%= master_uri %>"
       KONTENA_TOKEN="<%= grid_token %>"
-      KONTENA_PEER_INTERFACE=eth1
+      KONTENA_PEER_INTERFACE=eth0
       KONTENA_VERSION=<%= version %>
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
@@ -37,14 +37,21 @@ coreos:
         Restart=always
         RestartSec=5
         ExecStart=/usr/bin/docker logs --tail=10 -f kontena-etcd
-    - name: 10-weave.network
+    - name: 50-docker.network
+      mask: true
+    - name: 50-docker-veth.network
+      mask: true
+    - name: zz-default.network
       runtime: false
       content: |
+        # default should only match real network interfaces
         [Match]
-        Type=bridge
-        Name=weave*
-
+        Name=eth*
         [Network]
+        DHCP=yes
+        [DHCP]
+        UseMTU=true
+        UseDomains=true
     - name: kontena-agent.service
       command: start
       enable: true
@@ -62,6 +69,7 @@ coreos:
         Restart=always
         RestartSec=5
         EnvironmentFile=/etc/kontena-agent.env
+        EnvironmentFile=-/etc/kontena-agent.custom.env
         ExecStartPre=-/usr/bin/docker stop kontena-agent
         ExecStartPre=-/usr/bin/docker rm kontena-agent
         ExecStartPre=/usr/bin/docker pull kontena/agent:${KONTENA_VERSION}
@@ -73,3 +81,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/azure/cloudinit_master.yml

@@ -53,6 +53,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
@@ -82,9 +83,9 @@ coreos:
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             <% if server_name %>-e SERVER_NAME=<%= server_name %><% end %> \
-            <% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= intial_admin_code %><% end %> \
+            <% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
             kontena/server:${KONTENA_VERSION}
-
+        ExecStop=/usr/bin/docker stop kontena-server-api
     - name: kontena-server-haproxy.service
       command: start
       enable: true
@@ -107,3 +108,4 @@ coreos:
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker pull kontena/haproxy:latest
         ExecStart=/opt/bin/kontena-haproxy.sh
+        ExecStop=/usr/bin/docker stop kontena-server-haproxy

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

@@ -0,0 +1,33 @@
+module Kontena
+  module Machine
+    module Azure
+      module Common
+
+        def create_virtual_network(name, location)
+          address_space = ['10.0.0.0/20']
+          options = {subnet: [{:name => 'subnet-1',  :ip_address=>'10.0.0.0',  :cidr=>23}]}
+          client.network_management.set_network_configuration(name, location, address_space, options)
+        end
+
+        def virtual_network_exist?(name)
+          client.network_management.list_virtual_networks.find{|n| n.name == name}
+        end
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+
+        # @return [String]
+        def find_coreos_image
+          images = client.vm_image_management.list_os_images.select { |i|
+            i.name.include?('__CoreOS-Stable-')
+          }.sort_by { |i|
+            i.name.split('__CoreOS-Stable-')[1].to_i
+          }
+          image = images[-1]
+          image.name
+        end
+      end
+    end
+  end
+end

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

@@ -2,13 +2,16 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'json'
+require_relative 'common'
 
 module Kontena
   module Machine
     module Azure
       class MasterProvisioner
         include Kontena::Machine::RandomName
+        include Kontena::Machine::CertHelper
         include Kontena::Cli::ShellSpinner
+        include Common
 
         attr_reader :client, :http_client
 
@@ -19,29 +22,44 @@ module Kontena
           abort('Invalid management certificate') unless File.exists?(File.expand_path(certificate))
 
           @client = ::Azure
-          client.management_certificate = certificate
+          client.management_certificate = File.expand_path(certificate)
           client.subscription_id        = subscription_id
           client.vm_management.initialize_external_logger(Logger.new) # We don't want all the output
         end
 
         def run!(opts)
           abort('Invalid ssh key') unless File.exists?(File.expand_path(opts[:ssh_key]))
+          ssl_cert = nil
           if opts[:ssl_cert]
-            abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
+            abort('Invalid ssl cert (file not found)') unless File.exists?(File.expand_path(opts[:ssl_cert]))
             ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
+          else
+            spinner "Generating a self-signed SSL certificate" do
+              ssl_cert = generate_self_signed_cert
+            end
+          end
+
+          coreos_image = nil
+          spinner "Finding latest #{'CoreOS stable'.colorize(:cyan)} image" do
+            coreos_image = find_coreos_image
           end
+          abort('Cannot find CoreOS image') if coreos_image.nil?
+
           cloud_service_name = generate_cloud_service_name
           vm_name = cloud_service_name
           master_url = ''
           public_ip = nil
-          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}"
+          if opts[:virtual_network].nil?
+            location = opts[:location].downcase.gsub(' ', '-')
+            default_network_name = "kontena-#{location}"
+            spinner "Creating a virtual network #{default_network_name.colorize(:cyan)}" do
               create_virtual_network(default_network_name, opts[:location]) unless virtual_network_exist?(default_network_name)
-              opts[:virtual_network] = default_network_name
-              opts[:subnet] = 'subnet-1'
             end
+            opts[:virtual_network] = default_network_name
+            opts[:subnet] = 'subnet-1'
+          end
+
+          spinner "Creating an Azure Virtual Machine #{vm_name.colorize(:cyan)} to #{opts[:location].colorize(:cyan)}" do
 
             userdata_vars = opts.merge(
                 ssl_cert: ssl_cert,
@@ -52,7 +70,7 @@ module Kontena
                 vm_name: vm_name,
                 vm_user: 'core',
                 location: opts[:location],
-                image: '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-1010.5.0',
+                image: coreos_image,
                 custom_data: Base64.encode64(user_data(userdata_vars)),
                 ssh_key: opts[:ssh_key]
             }
@@ -62,27 +80,20 @@ module Kontena
                 deployment_name: vm_name,
                 virtual_network_name: opts[:virtual_network],
                 subnet_name: opts[:subnet],
-                tcp_endpoints: '80,443',
+                tcp_endpoints: '443',
                 private_key_file: File.expand_path(opts[:ssh_key]),
                 ssh_port: 22,
                 vm_size: opts[:size],
             }
 
-
             virtual_machine =  client.vm_management.create_virtual_machine(params,options)
             public_ip = virtual_machine.ipaddress
-
-            if opts[:ssl_cert]
-              master_url = "https://#{virtual_machine.ipaddress}"
-            else
-              master_url = "http://#{virtual_machine.ipaddress}"
-            end
-
+            master_url = "https://#{virtual_machine.ipaddress}"
           end
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          spinner "Waiting for #{vm_name.colorize(:cyan)} to start" do
+          spinner "Waiting for #{vm_name.colorize(:cyan)} to start (#{master_url})" do
             sleep 0.5 until master_running?
           end
 
@@ -93,17 +104,18 @@ module Kontena
 
           spinner "Kontena Master #{master_version} is now running at #{master_url}".colorize(:green)
 
-          {
+          data = {
             name: opts[:name] || cloud_service_name.sub('kontena-master-', ''),
             public_ip: public_ip,
             provider: 'azure',
             version: master_version,
             code: opts[:initial_admin_code]
           }
-        end
+          if respond_to?(:certificate_public_key) && !opts[:ssl_cert]
+            data[:ssl_certificate] = certificate_public_key(ssl_cert)
+          end
 
-        def erb(template, vars)
-          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+          data
         end
 
         def user_data(vars)
@@ -120,20 +132,6 @@ module Kontena
         def generate_cloud_service_name
           "kontena-master-#{generate_name}-#{rand(1..99)}"
         end
-
-        def cloud_service(name)
-          client.cloud_service_management.get_cloud_service(name)
-        end
-
-        def virtual_network_exist?(name)
-          client.network_management.list_virtual_networks.find{|n| n.name == name}
-        end
-
-        def create_virtual_network(name, location)
-          address_space = ['10.0.0.0/20']
-          options = {subnet: [{:name => 'subnet-1',  :ip_address=>'10.0.0.0',  :cidr=>23}]}
-          client.network_management.set_network_configuration(name, location, address_space, options)
-        end
       end
     end
   end

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

@@ -23,24 +23,26 @@ module Kontena
         end
 
         def run!(grid, name)
-          spinner "Terminating Azure Virtual Machine #{name.colorize(:cyan)} " do
-            vm = client.vm_management.get_virtual_machine(name, cloud_service_name(name, grid['name']))
-            if vm
-              out = StringIO.new
-              $stdout = out # to avoid debug data (https://github.com/Azure/azure-sdk-for-ruby/issues/200)
+
+          vm = client.vm_management.get_virtual_machine(name, cloud_service_name(name, grid['name']))
+          if vm
+            spinner "Terminating Azure Virtual Machine #{name.colorize(:cyan)} " do
               client.vm_management.delete_virtual_machine(name, cloud_service_name(name, grid['name']))
-              storage_account = client.storage_management.list_storage_accounts.find{|a| a.label == cloud_service_name(name, grid['name'])}
-              client.storage_management.delete_storage_account(storage_account.name) if storage_account
-              $stdout = STDOUT
-            else
-              abort "\nCannot find Virtual Machine #{name.colorize(:cyan)} in Azure"
             end
-         end
+            storage_account = client.storage_management.list_storage_accounts.find{|a| a.label == cloud_service_name(name, grid['name'])}
+            if storage_account
+              spinner "Removing Azure Storage Account #{storage_account.name.colorize(:cyan)} " do
+                client.storage_management.delete_storage_account(storage_account.name)
+              end
+            end
+          else
+            abort "\nCannot find Virtual Machine #{name.colorize(:cyan)} in Azure"
+          end
 
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
             spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
-              api_client.delete("grids/#{grid['id']}/nodes/#{name}")
+              api_client.delete("nodes/#{grid['id']}/#{name}")
             end
           end
         end

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

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'base64'
+require_relative 'common'
 
 module Kontena
   module Machine
@@ -9,6 +10,7 @@ module Kontena
       class NodeProvisioner
         include Kontena::Machine::RandomName
         include Kontena::Cli::ShellSpinner
+        include Common
 
         attr_reader :client, :api_client
 
@@ -31,15 +33,23 @@ module Kontena
           vm_name = opts[:name] || generate_name
           cloud_service_name = generate_cloud_service_name(vm_name, opts[:grid])
 
-          spinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
-            if opts[:virtual_network].nil?
-              location = opts[:location].downcase.gsub(' ', '-')
-              default_network_name = "kontena-#{location}"
+          coreos_image = nil
+          spinner "Finding latest #{'CoreOS stable'.colorize(:cyan)} image" do
+            coreos_image = find_coreos_image
+          end
+          abort('Cannot find CoreOS image') if coreos_image.nil?
+
+          if opts[:virtual_network].nil?
+            location = opts[:location].downcase.gsub(' ', '-')
+            default_network_name = "kontena-#{location}"
+            spinner "Creating virtual network #{default_network_name}" do
               create_virtual_network(default_network_name, opts[:location]) unless virtual_network_exist?(default_network_name)
-              opts[:virtual_network] = default_network_name
-              opts[:subnet] = 'subnet-1'
             end
+            opts[:virtual_network] = default_network_name
+            opts[:subnet] = 'subnet-1'
+          end
 
+          spinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
             userdata_vars = {
               version: opts[:version],
               master_uri: opts[:master_uri],
@@ -50,7 +60,7 @@ module Kontena
               vm_name: vm_name,
               vm_user: 'core',
               location: opts[:location],
-              image: '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-1010.5.0',
+              image: coreos_image,
               custom_data: Base64.encode64(user_data(userdata_vars)),
               ssh_key: File.expand_path(opts[:ssh_key])
             }
@@ -59,13 +69,13 @@ module Kontena
               deployment_name: vm_name,
               virtual_network_name: opts[:virtual_network],
               subnet_name: opts[:subnet],
-              tcp_endpoints: '80',
+              tcp_endpoints: '80,443,6783',
+              udp_endpoints: '1194,6783,6784',
               private_key_file: opts[:ssh_key],
               ssh_port: 22,
               vm_size: opts[:size],
             }
 
-
             client.vm_management.create_virtual_machine(params,options)
           end
           spinner "Waiting for node #{vm_name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
@@ -110,20 +120,10 @@ module Kontena
           client.cloud_service_management.get_cloud_service(name)
         end
 
-        def virtual_network_exist?(name)
-          client.network_management.list_virtual_networks.find{|n| n.name == name}
-        end
-
-        def create_virtual_network(name, location)
-          address_space = ['10.0.0.0/20']
-          options = {subnet: [{:name => 'subnet-1',  :ip_address=>'10.0.0.0',  :cidr=>23}]}
-          client.network_management.set_network_configuration(name, location, address_space, options)
-        end
-
         def set_labels(node, labels)
           data = {}
           data[:labels] = labels
-          api_client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+          api_client.put("nodes/#{node['grid']['id']}/#{node['id']}", data)
         end
       end
 

data/lib/kontena/plugin/azure.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Azure
-      VERSION = "0.2.5"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/kontena/plugin/azure/common.rb

@@ -0,0 +1,53 @@
+
+module Kontena::Plugin::Azure::Common
+  LOCATIONS = [
+    'East US',
+    'East US 2',
+    'Central US',
+    'North Central US',
+    'South Central US',
+    'West Central US',
+    'West US',
+    'West US 2',
+    'US Gov Virginia',
+    'US Gov Iowa',
+    'Canada East',
+    'Canada Central',
+    'Brazil South',
+
+    'North Europe',
+    'West Europe',
+    'Germany Central',
+    'Germany Northeast',
+    'UK West',
+    'UK South',
+
+    'Southeast Asia',
+    'East Asia',
+    'Australia East',
+    'Australia Southeast',
+    'Central India',
+    'West India',
+    'South India',
+    'Japan East',
+    'Japan West',
+    'China East',
+    'China North'
+  ].freeze
+
+  SIZES = [
+    'ExtraSmall',
+    'Small',
+    'Medium',
+    'Large',
+    'ExtraLarge'
+  ]
+
+  def locations
+    LOCATIONS
+  end
+
+  def sizes
+    SIZES
+  end
+end

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

@@ -1,24 +1,26 @@
 require 'securerandom'
+require_relative '../common'
 
 module Kontena::Plugin::Azure::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Plugin::Azure::Common
 
     option "--name", "[NAME]", "Set Master name"
     option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
     option "--subscription-cert", "CERTIFICATE", "Path to Azure management certificate", attribute_name: :certificate, required: true
-    option "--size", "SIZE", "SIZE", default: 'Small'
+    option "--size", "SIZE", "Virtual machine size, see https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-sizes", required: true
     option "--network", "NETWORK", "Virtual Network name"
     option "--subnet", "SUBNET", "Subnet name"
     option "--ssh-key", "SSH KEY", "SSH private key file", required: true
-    option "--location", "LOCATION", "Location", default: 'West Europe'
+    option "--location", "LOCATION", "Location", required: true
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
-      require 'kontena/machine/azure'
+      require_relative '../../../machine/azure'
       provisioner = provisioner(subscription_id, certificate)
       provisioner.run!(
           name: name,
@@ -41,5 +43,27 @@ module Kontena::Plugin::Azure::Master
     def provisioner(subscription_id, certificate)
       Kontena::Machine::Azure::MasterProvisioner.new subscription_id, certificate
     end
+
+    def default_location
+      prompt.select("Choose location: ") do |menu|
+        locations.each do |l|
+          menu.choice l
+        end
+      end
+    end
+
+    def default_size
+      size = prompt.select("Choose virtual machine size: ") do |menu|
+        menu.default 2
+        sizes.each do |s|
+          menu.choice s
+        end
+        menu.choice 'Other'
+      end
+      if size == 'Other'
+        size = prompt.ask("Virtual machine size? (see https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-sizes#size-tables)")
+      end
+      size
+    end
   end
 end

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

@@ -1,15 +1,17 @@
+require_relative '../common'
 module Kontena::Plugin::Azure::Nodes
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::Azure::Common
 
-    option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
-    option "--subscription-cert", "CERTIFICATE", "Path to Azure management certificate", attribute_name: :certificate, required: true
-    option "--size", "SIZE", "SIZE", default: 'Small'
+    option "--subscription-id", "ID", "Azure subscription id", required: true
+    option "--subscription-cert", "CERT", "Path to Azure management certificate", attribute_name: :certificate, required: true
+    option "--size", "SIZE", "Virtual machine size, see https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-sizes", required: true
+    option "--ssh-key", "SSH KEY", "SSH private key file", required: true
+    option "--location", "LOCATION", "Location", required: true
     option "--network", "NETWORK", "Virtual Network name"
     option "--subnet", "SUBNET", "Subnet name"
-    option "--ssh-key", "SSH KEY", "SSH private key file", required: true
-    option "--location", "LOCATION", "Location", default: 'West Europe'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     parameter "[NAME]", "Node name"
@@ -18,7 +20,7 @@ module Kontena::Plugin::Azure::Nodes
       require_api_url
       require_current_grid
 
-      require 'kontena/machine/azure'
+      require_relative '../../../machine/azure'
       grid = fetch_grid
       provisioner = provisioner(client(require_token), subscription_id, certificate)
       provisioner.run!(
@@ -47,5 +49,28 @@ module Kontena::Plugin::Azure::Nodes
     def fetch_grid
       client(require_token).get("grids/#{current_grid}")
     end
+
+    def default_location
+      prompt.select("Choose location: ") do |menu|
+        locations.each do |l|
+          menu.choice l
+        end
+      end
+    end
+
+    def default_size
+      size = prompt.select("Choose virtual machine size: ") do |menu|
+        menu.default 3
+        sizes.each do |s|
+          menu.choice s
+        end
+        menu.choice 'Other'
+      end
+      if size == 'Other'
+        size = prompt.ask("Virtual machine size? (see https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-sizes#size-tables)")
+      end
+
+      size
+    end
   end
 end

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

@@ -12,7 +12,7 @@ module Kontena::Plugin::Azure::Nodes
       require_api_url
       require_current_grid
 
-      require 'kontena/machine/azure'
+      require_relative '../../../machine/azure'
 
       client = ::Azure
       client.management_certificate = certificate

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

@@ -6,12 +6,15 @@ module Kontena::Plugin::Azure::Nodes
     parameter "NAME", "Node name"
     option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
     option "--subscription-cert", "CERTIFICATE", "Path to Azure management certificate", attribute_name: :certificate, required: true
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       require_current_grid
 
-      require 'kontena/machine/azure'
+      confirm_command(name) unless forced?
+
+      require_relative '../../../machine/azure'
 
       grid = fetch_grid
       destroyer = destroyer(client(require_token), subscription_id, certificate)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-azure
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Kontena Microsoft Azure plugin
+description: Kontena Microsoft Azure (classic) plugin
 email:
 - info@kontena.io
 executables: []
@@ -98,11 +98,13 @@ files:
 - lib/kontena/machine/azure.rb
 - lib/kontena/machine/azure/cloudinit.yml
 - lib/kontena/machine/azure/cloudinit_master.yml
+- lib/kontena/machine/azure/common.rb
 - lib/kontena/machine/azure/logger.rb
 - lib/kontena/machine/azure/master_provisioner.rb
 - lib/kontena/machine/azure/node_destroyer.rb
 - lib/kontena/machine/azure/node_provisioner.rb
 - lib/kontena/plugin/azure.rb
+- lib/kontena/plugin/azure/common.rb
 - lib/kontena/plugin/azure/master/create_command.rb
 - lib/kontena/plugin/azure/master_command.rb
 - lib/kontena/plugin/azure/node_command.rb
@@ -134,5 +136,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Kontena Azure plugin
+summary: Kontena Azure (classic) plugin
 test_files: []