kontena-plugin-packet 0.1.2 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY5ODFmM2UxZjAzMjBjNGQ0ZTdmNzYxNjgzZjVhMDkxOGU3YmQyYw==
+    OTE0NzVkM2EzYzQxMDEyNTE5YTUxMzEwZWYyYTZiYWRjYzZhOTJlOA==
   data.tar.gz: !binary |-
-    NGU5ZjkwOTliYzdkNjRkMmIwNGQ3YjExY2FiOGU5ZjQwOGEyN2JhZg==
+    MzcxYjQ1ZDM5ZTIzNzdkNDQ0NmJmODQwYTZlZmQwNmJkMGEwOTI1Yw==
 SHA512:
   metadata.gz: !binary |-
-    ODIxMDI2ZjhjOWUwYWI3MmIzODdmMzA4ZGI1OTNjNzFlZDE1MTcyYmIwM2Qx
-    MDA5MjFmNDdmNWY0ZDI3ZTNhODNjNjQyMGFkMDJmNWY5NjQ2YjI3MWQxNjEz
-    YTA4MjRjOWNmMGE4ODRjYjEyNTFiMTg3MTc5ODljOGU2M2MyMDQ=
+    ODM5OTNkMTE1NDk4NDY1Y2U4YTQwZTdiOTIxN2U0MmI3NjRmZGM3NmI2MzUx
+    ZjEzODYyNzU0YWVkMGYxYWRmYmQxZjlmNjZkMmNlZjgyZWVjOTM3NjdlMGVm
+    OTVmMDk1YTc1M2FiYzRkMTc4NDg5MTQyNDc4MDgwYjk2NWRlOWE=
   data.tar.gz: !binary |-
-    YTNhMDI0MjYwZWE0ZDhhODUzYTg3NmQ3NjUwODJkMGRhYzRjOWIyYjJmZWNk
-    ODgwYTMzN2ViMmY4MmQ0NWMzN2U3MmQ5Mjc1Nzk2OGZlYjgxODI3YTNlMTkx
-    ZjRlYWU2MWVkZjczMDAzMTBlZmZmOWY1MmZjYzc2OTBiYmU0MTQ=
+    YjFjNjAwNzg5NTFkZTI2MzIwY2ZkNTkyZDZiZTJiODc0ZTRhODJmZjk2MWFk
+    Y2I5NWI1ZWE1ZDM2MGVjN2IzODJiYmRkNDI3YjBjM2UyNTgwNDAzYjA3NzM2
+    MDAxYzZkYzhhMzczYWYzNmZmYmQyZGJjZjI4NGYzYTU5ZDc0NzI=

data/kontena-plugin-packet.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kontena-cli', '~> 0.15.4'
-  spec.add_runtime_dependency 'packethost', '>= 0.0.8'
+  spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
+  spec.add_runtime_dependency 'packethost', '>= 0.0.6'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -88,8 +88,11 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
 <% end -%>
-<% if auth_server %>
-            -e AUTH_API_URL=<%= auth_server %> \
+<% if server_name %>
+            -e KONTENA_SERVER_NAME=<%= server_name %> \
+<% end -%>
+<% if initial_admin_code %>
+            -e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
 <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}

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

@@ -1,5 +1,3 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Packet
@@ -7,6 +5,7 @@ module Kontena
         include RandomName
         include Machine::CertHelper
         include PacketCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :http_client
 
@@ -27,22 +26,20 @@ 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
-            ShellSpinner "Generating self-signed SSL certificate" do
+            spinner "Generating self-signed SSL certificate" do
               ssl_cert = generate_self_signed_cert
             end
           end
 
-          userdata_vars = {
+          name = generate_name
+
+          userdata_vars = opts.merge(
             ssl_cert: ssl_cert,
-            auth_server: opts[:auth_server],
-            version: opts[:version],
-            vault_secret: opts[:vault_secret],
-            vault_iv: opts[:vault_iv],
-            mongodb_uri: opts[:mongodb_uri]
-          }
+            server_name: name.sub('kontena-master-', '')
+          )
 
           device = project.new_device(
-            hostname: generate_name,
+            hostname: name,
             facility: facility.to_hash,
             operating_system: os.to_hash,
             plan: plan.to_hash,
@@ -51,7 +48,7 @@ module Kontena
             userdata: user_data(userdata_vars, 'cloudinit_master.yml')
           )
 
-          ShellSpinner "Creating Packet device #{device.hostname.colorize(:cyan)} " do
+          spinner "Creating Packet device #{device.hostname.colorize(:cyan)} " do
             api_retry "Packet API reported an error, please try again" do
               response = client.create_device(device)
               raise response.body unless response.success?
@@ -69,12 +66,19 @@ module Kontena
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          ShellSpinner "Waiting for #{device.hostname.colorize(:cyan)} to start (estimate 4 minutes)" do
-            sleep 5 until master_running?
+          spinner "Waiting for #{device.hostname.colorize(:cyan)} to start (estimate 4 minutes)" do
+            sleep 0.5 until master_running?
           end
 
-          puts "Kontena Master is now running at #{master_url}"
-          puts "Use #{"kontena login --name=#{device.hostname.sub('kontena-master-', '')} #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+          puts
+          puts "Kontena Master is now running at #{master_url}".colorize(:green)
+          puts
+
+          {
+            name: name.sub('kontena-master-', ''),
+            public_ip: public_ip['address'],
+            code: opts[:initial_admin_code]
+          }
         end
 
         def generate_name

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

@@ -1,11 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Packet
       class NodeDestroyer
         include RandomName
         include PacketCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -20,7 +19,7 @@ module Kontena
           device = client.list_devices(project_id).find{|d| d.hostname == name}
           abort("Device #{name.colorize(:cyan)} not found in Packet") unless device
 
-          ShellSpinner "Terminating Packet device #{name.colorize(:cyan)} " do
+          spinner "Terminating Packet device #{name.colorize(:cyan)} " do
             begin
               response = client.delete_device(device.id)
               raise unless response.success?
@@ -31,7 +30,7 @@ module Kontena
 
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
-            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
+            spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
               api_client.delete("grids/#{grid['id']}/nodes/#{name}")
             end
           end

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

@@ -1,11 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Packet
       class NodeProvisioner
         include RandomName
         include PacketCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -40,7 +39,7 @@ module Kontena
             userdata: user_data(userdata_vars, 'cloudinit.yml')
           )
 
-          ShellSpinner "Creating Packet device #{device.hostname.colorize(:cyan)} " do
+          spinner "Creating Packet device #{device.hostname.colorize(:cyan)} " do
             api_retry "Packet API reported an error, please try again" do
               response = client.create_device(device)
               raise response.body unless response.success?
@@ -48,13 +47,13 @@ module Kontena
 
             until device && [:active, :provisioning, :powering_on].include?(device.state)
               device = find_device(project.id, device.hostname) rescue nil
-              sleep 5
+              sleep 1
             end
           end
 
           node = nil
-          ShellSpinner "Waiting for node #{device.hostname.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} (estimate 4 minutes) " do
-            sleep 2 until node = device_exists_in_grid?(opts[:grid], device)
+          spinner "Waiting for node #{device.hostname.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} (estimate 4 minutes) " do
+            sleep 0.5 until node = device_exists_in_grid?(opts[:grid], device)
           end
           set_labels(node, ["region=#{opts[:facility]}", "provider=packet"])
         end

data/lib/kontena/machine/packet/node_restarter.rb

@@ -1,11 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Packet
       class NodeRestarter
         include RandomName
         include PacketCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client
 
@@ -21,7 +20,7 @@ module Kontena
           abort("Device #{name.colorize(:cyan)} not found in Packet") unless device
           abort("Your version of 'packethost' gem does not support rebooting servers") unless client.respond_to?(:reboot_device)
 
-          ShellSpinner "Restarting Packet device #{device.hostname.colorize(:cyan)} " do
+          spinner "Restarting Packet device #{device.hostname.colorize(:cyan)} " do
             begin
               response = client.reboot_device(device)
               raise unless response.success?
@@ -31,7 +30,7 @@ module Kontena
             sleep 5
             until device && device.state == :active
               device = find_device(project.id, device.hostname) rescue nil
-              sleep 5
+              sleep 1
             end
           end
         end

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

@@ -4,6 +4,7 @@ module Kontena::Plugin::Packet::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
 
+    option "--name", "[NAME]", "Set master name"
     option "--token", "TOKEN", "Packet API token", required: true
     option "--project", "PROJECT ID", "Packet project id", required: true
     option "--ssl-cert", "PATH", "SSL certificate file (optional)"
@@ -15,7 +16,6 @@ module Kontena::Plugin::Packet::Master
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
-    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
 
     def execute
       require_relative '../../../machine/packet'
@@ -29,9 +29,9 @@ module Kontena::Plugin::Packet::Master
           plan: plan,
           facility: facility,
           version: version,
-          auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),
+          initial_admin_code: SecureRandom.hex(16),
           mongodb_uri: mongodb_uri
       )
     end

data/lib/kontena/plugin/packet.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-packet
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
@@ -14,30 +14,30 @@ dependencies:
   name: kontena-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: packethost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5