kontena-cli 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2886c09f3faeaa711f9fb89e078cd06dd9b035
-  data.tar.gz: 0c012c5a9c66d1f600f74ec65d477395cd394e0b
+  metadata.gz: 1f305f0ca1c6bc181e196a563c5ed94a655730c2
+  data.tar.gz: 88fc9e71efb97c60f88177f6b92f59698f721cc0
 SHA512:
-  metadata.gz: 9799fc52f4c464b8f9adea3e77abe4d4bafb00fadbd205643ab32015c2711010650ac559fe37c275327d4b2a86e48304dad1e09d557d8670750306b85b86fa64
-  data.tar.gz: 311c7b76896963a5d1aca5d17d8c460da41b660377d9914e20e48ea1b712d837c1c4dd450480a3858d949f37ddcac73e07e4f02250bfa00751357a04e62dd615
+  metadata.gz: 7ac41e08e835a3e08d39ce84f7a0449fa0caff81d848583c407d27d29c9afbd9689f0e71224f81a31fdaad7e6be05f3aa5f6da6e6928b3b02c4890c13315220d
+  data.tar.gz: d0743250c47ac3299ec47de4b368f14b2bf8d47ff5f0fa027d8f32bf2dab182b5e6dd4d61f8a05940614ad8509c5d357b307e2256820586dc5550463fb78f132

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/lib/kontena/cli/grids/env_command.rb

@@ -20,8 +20,12 @@ module Kontena::Cli::Grids
         abort("Grid not found".colorize(:red)) unless grid
 
         prefix = export? ? 'export ' : ''
-        puts "#{prefix}KONTENA_URI=#{settings['server']['url'].sub('http', 'ws')}"
-        puts "#{prefix}KONTENA_TOKEN=#{grid['token']}"
+
+        server = settings['servers'].find{|s| s['name'] == settings['current_server']}
+        if server
+          puts "#{prefix}KONTENA_URI=#{server['url'].sub('http', 'ws')}"
+          puts "#{prefix}KONTENA_TOKEN=#{server['token']}"
+        end
       end
     end
   end

data/lib/kontena/machine/aws/cloudinit_master.yml

@@ -29,8 +29,6 @@ write_files:
         -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
-  update:
-      reboot-strategy: off
   units:
     - name: kontena-server-mongo.service
       command: start
@@ -70,6 +68,8 @@ coreos:
         Requires=network-online.target
         Requires=docker.service
         Requires=kontena-server-mongo.service
+        Before=kontena-server-haproxy.service
+        Wants=kontena-server-haproxy.service
 
         [Service]
         Restart=always
@@ -97,6 +97,7 @@ coreos:
         Documentation=http://www.kontena.io/
         Requires=network-online.target
         Requires=docker.service
+        Requires=kontena-server-api.service
 
         [Service]
         Restart=always

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

@@ -0,0 +1,27 @@
+module Kontena
+  module Machine
+    module Aws
+      module Common
+
+        # @param [String] region
+        # @return String
+        def resolve_ami(region)
+          images = {
+              'eu-central-1' => 'ami-fee2fb92',
+              'ap-northeast-1' => 'ami-26033d48',
+              'us-gov-west-1' => 'ami-bdf04cdc',
+              'sa-east-1' => 'ami-10c5457c',
+              'ap-southeast-2' => 'ami-dc8baebf',
+              'ap-southeast-1' => 'ami-6969a50a',
+              'us-east-1' => 'ami-23260749',
+              'us-west-2' => 'ami-20927640',
+              'us-west-1' => 'ami-c2e490a2',
+              'eu-west-1' => 'ami-7e72c70d'
+          }
+          images[region]
+        end
+        
+      end
+    end
+  end
+end

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

@@ -2,20 +2,26 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'shell-spinner'
+require_relative 'common'
 
 module Kontena
   module Machine
     module Aws
       class MasterProvisioner
         include RandomName
+        include Common
         attr_reader :client, :http_client, :region
 
         # @param [String] access_key_id aws_access_key_id
         # @param [String] secret_key aws_secret_access_key
         # @param [String] region
         def initialize(access_key_id, secret_key, region)
-          @client = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => access_key_id, :aws_secret_access_key => secret_key, :region => region)
-
+          @client = Fog::Compute.new(
+            :provider => 'AWS',
+            :aws_access_key_id => access_key_id,
+            :aws_secret_access_key => secret_key,
+            :region => region
+          )
         end
 
         # @param [Hash] opts
@@ -112,25 +118,6 @@ module Kontena
           security_group
         end
 
-        # @param [String] region
-        # @return String
-        def resolve_ami(region)
-          images = {
-              'eu-central-1' => 'ami-74bbba69',
-              'ap-northeast-1' => 'ami-1e77ff1e',
-              'us-gov-west-1' => 'ami-f1d1b2d2',
-              'sa-east-1' => 'ami-632ba17e',
-              'ap-southeast-2' => 'ami-83f8b4b9',
-              'ap-southeast-1' => 'ami-12060c40',
-              'us-east-1' => 'ami-f396fa96',
-              'us-west-2' => 'ami-99bfada9',
-              'us-west-1' => 'ami-dbe71d9f',
-              'eu-west-1' => 'ami-83e9c8f4'
-          }
-          images[region]
-        end
-
-
         def default_subnet(vpc, zone)
           client.subnets.all('vpc-id' => vpc, 'availabilityZone' => zone).first
         end
@@ -160,4 +147,4 @@ module Kontena
       end
     end
   end
-end
+end

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

@@ -2,12 +2,14 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'shell-spinner'
+require_relative 'common'
 
 module Kontena
   module Machine
     module Aws
       class NodeProvisioner
         include RandomName
+        include Common
 
         attr_reader :client, :api_client, :region
 
@@ -17,8 +19,10 @@ module Kontena
         # @param [String] region
         def initialize(api_client, access_key_id, secret_key, region)
           @api_client = api_client
-          @client = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => access_key_id, :aws_secret_access_key => secret_key, :region => region)
-
+          @client = Fog::Compute.new(
+            :provider => 'AWS', :aws_access_key_id => access_key_id,
+            :aws_secret_access_key => secret_key, :region => region
+          )
         end
 
         # @param [Hash] opts
@@ -70,7 +74,7 @@ module Kontena
           ShellSpinner "Creating AWS instance #{name.colorize(:cyan)} " do
             instance.wait_for { ready? }
           end
-          client.create_tags(instance.id, {'kontena_name' => name, 'kontena_grid' => opts[:grid]})
+          client.create_tags(instance.id, {'Name' => name, 'kontena_grid' => opts[:grid]})
           node = nil
           ShellSpinner "Waiting for node #{name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
             sleep 2 until node = instance_exists_in_grid?(opts[:grid], name)
@@ -103,30 +107,12 @@ module Kontena
           security_group.authorize_port_range(80..80)
           security_group.authorize_port_range(443..443)
           security_group.authorize_port_range(22..22)
+          security_group.authorize_port_range(1194..1194, ip_protocol: 'udp')
           security_group.authorize_port_range(6783..6783, group: {security_group.owner_id => security_group.group_id}, ip_protocol: 'tcp')
-          security_group.authorize_port_range(6783..6783, group: {security_group.owner_id => security_group.group_id}, ip_protocol: 'udp')
+          security_group.authorize_port_range(6783..6784, group: {security_group.owner_id => security_group.group_id}, ip_protocol: 'udp')
           security_group
         end
 
-
-        # @param [String] region
-        # @return String
-        def resolve_ami(region)
-          images = {
-              'eu-central-1' => 'ami-74bbba69',
-              'ap-northeast-1' => 'ami-1e77ff1e',
-              'us-gov-west-1' => 'ami-f1d1b2d2',
-              'sa-east-1' => 'ami-632ba17e',
-              'ap-southeast-2' => 'ami-83f8b4b9',
-              'ap-southeast-1' => 'ami-12060c40',
-              'us-east-1' => 'ami-f396fa96',
-              'us-west-2' => 'ami-99bfada9',
-              'us-west-1' => 'ami-dbe71d9f',
-              'eu-west-1' => 'ami-83e9c8f4'
-          }
-          images[region]
-        end
-
         def default_subnet(vpc, zone)
           client.subnets.all('vpc-id' => vpc, 'availabilityZone' => zone).first
         end
@@ -165,4 +151,4 @@ module Kontena
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,6 +261,7 @@ files:
 - lib/kontena/machine/aws.rb
 - lib/kontena/machine/aws/cloudinit.yml
 - lib/kontena/machine/aws/cloudinit_master.yml
+- lib/kontena/machine/aws/common.rb
 - lib/kontena/machine/aws/master_provisioner.rb
 - lib/kontena/machine/aws/node_destroyer.rb
 - lib/kontena/machine/aws/node_provisioner.rb