kontena-plugin-packet 0.2.0.pre1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTE0NzVkM2EzYzQxMDEyNTE5YTUxMzEwZWYyYTZiYWRjYzZhOTJlOA==
+    MGQwYzI5OTg5MTkwZDM5NDQyNzZlMzE3MzFkYzBhZmI5ZmYxMWM4Mw==
   data.tar.gz: !binary |-
-    MzcxYjQ1ZDM5ZTIzNzdkNDQ0NmJmODQwYTZlZmQwNmJkMGEwOTI1Yw==
+    OWIzNDcwMWYwODY2YjI5ZTVlMjgyMTgyZjA4ZDE5ZDM0YWNiNzFhNA==
 SHA512:
   metadata.gz: !binary |-
-    ODM5OTNkMTE1NDk4NDY1Y2U4YTQwZTdiOTIxN2U0MmI3NjRmZGM3NmI2MzUx
-    ZjEzODYyNzU0YWVkMGYxYWRmYmQxZjlmNjZkMmNlZjgyZWVjOTM3NjdlMGVm
-    OTVmMDk1YTc1M2FiYzRkMTc4NDg5MTQyNDc4MDgwYjk2NWRlOWE=
+    YjM0MzkwZTU0M2YzYzYxZTc0ZDEwMDA5MDBmMGFmZDdhYWE0NTg1ZTA0MTBl
+    Y2EwMGEyMTQyMTNmZDk0MWRlYWEzMzJjZmNiZGY3MzZmNGNjOTU3YTAzMDRl
+    NzhkMzM1NmM2YzAzYTczM2FiNGI1YmUxMmNlYTJhNDI1NTYzNzY=
   data.tar.gz: !binary |-
-    YjFjNjAwNzg5NTFkZTI2MzIwY2ZkNTkyZDZiZTJiODc0ZTRhODJmZjk2MWFk
-    Y2I5NWI1ZWE1ZDM2MGVjN2IzODJiYmRkNDI3YjBjM2UyNTgwNDAzYjA3NzM2
-    MDAxYzZkYzhhMzczYWYzNmZmYmQyZGJjZjI4NGYzYTU5ZDc0NzI=
+    MGQ5MTY0MmQxMjgzZDc4MjJlNjE0MjA3MTIwMGMwYjc0YWE5NzIxMjAxZWM1
+    MjMyMTE4MWQ4NzI3NTc5YTM0Y2QzMTNjZTgyZjg1Nzc3NzM2MzYwZmJiNDdi
+    MTNjZjlmYWE2YTA2ZWM4NTQwMTdjMjdiYTNlYmNhYmZhYTA3Mjc=

data/kontena-plugin-packet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
-  spec.add_runtime_dependency 'packethost', '>= 0.0.6'
+  spec.add_runtime_dependency 'packethost', '>= 0.0.8'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -28,6 +28,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/packet/cloudinit_master.yml

@@ -88,11 +88,11 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
 <% end -%>
-<% if server_name %>
-            -e KONTENA_SERVER_NAME=<%= server_name %> \
+<% if server_name -%>
+            -e SERVER_NAME=<%= server_name %> \
 <% end -%>
-<% if initial_admin_code %>
-            -e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
+<% if initial_admin_code -%>
+            -e 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,3 +1,5 @@
+require 'json'
+
 module Kontena
   module Machine
     module Packet
@@ -5,7 +7,7 @@ module Kontena
         include RandomName
         include Machine::CertHelper
         include PacketCommon
-        include Kontena::Cli::ShellSpinner
+        include Kontena::Cli::Common
 
         attr_reader :client, :http_client
 
@@ -26,7 +28,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
@@ -48,7 +50,7 @@ module Kontena
             userdata: user_data(userdata_vars, 'cloudinit_master.yml')
           )
 
-          spinner "Creating Packet device #{device.hostname.colorize(:cyan)} " do
+          spinner "Creating a 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?
@@ -70,14 +72,19 @@ 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: name.sub('kontena-master-', ''),
             public_ip: public_ip['address'],
-            code: opts[:initial_admin_code]
+            code: opts[:initial_admin_code],
+            provider: 'packet',
+            version: master_version
           }
         end
 

data/lib/kontena/plugin/packet.rb

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

data/lib/kontena/plugin/packet/facility_option.rb

@@ -0,0 +1,43 @@
+module Kontena::Plugin::Packet
+  module FacilityOption
+
+    def self.included(base)
+      base.option "--facility", "CODE", "Packet facility"
+      base.class_eval do
+        def default_facility
+          require 'packet'
+          client = Packet::Client.new(self.token || (self.respond_to?(:default_token) && self.default_token))
+
+          facilities = []
+          spinner "Retrieving a list of available facilities at Packet" do
+            facilities = client.list_facilities
+          end
+
+          case facilities.size
+          when 0
+            abort 'You do not have access to any facilities on Packet'
+          when 1
+            unless Kontena.prompt.yes?("You have access to facility '#{facilities.first.name}'. Use?")
+              abort 'Aborted'
+            end
+            facilities.first.code
+          else
+            Kontena.prompt.select "Packet facility:" do |menu|
+              facilities.each do |facility|
+                if facility.features.empty?
+                  feats = ""
+                else
+                  feats = "(#{facility.features.join(',')})"
+                end
+                menu.choice "#{facility.name} #{feats}", facility.code
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

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

@@ -1,17 +1,21 @@
 require 'securerandom'
+require_relative '../token_option'
+require_relative '../project_option'
+require_relative '../type_option'
+require_relative '../facility_option'
 
 module Kontena::Plugin::Packet::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Plugin::Packet::TokenOption
+    include Kontena::Plugin::Packet::ProjectOption
+    include Kontena::Plugin::Packet::TypeOption
+    include Kontena::Plugin::Packet::FacilityOption
 
     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)"
-    option "--type", "TYPE", "Server type (baremetal_0, baremetal_1, ..)", default: 'baremetal_0', attribute_name: :plan
-    option "--facility", "FACILITY CODE", "Facility", default: 'ams1'
     option "--billing", "BILLING", "Billing cycle", default: 'hourly'
-    option "--ssh-key", "PATH", "Path to ssh public key (optional)"
+    option "--ssh-key", "PATH", "Path to ssh public key", default: File.join(Dir.home, '.ssh', 'id_rsa.pub')
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"

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

@@ -1,15 +1,21 @@
+require_relative '../token_option'
+require_relative '../project_option'
+require_relative '../type_option'
+require_relative '../facility_option'
+
 module Kontena::Plugin::Packet::Nodes
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::Packet::TokenOption
+    include Kontena::Plugin::Packet::ProjectOption
+    include Kontena::Plugin::Packet::TypeOption
+    include Kontena::Plugin::Packet::FacilityOption
 
     parameter "[NAME]", "Node name"
-    option "--token", "TOKEN", "Packet API token", required: true
-    option "--project", "PROJECT ID", "Packet project id", required: true
-    option "--type", "TYPE", "Server type (baremetal_0, baremetal_1, ..)", default: 'baremetal_0', attribute_name: :plan
-    option "--facility", "FACILITY CODE", "Facility", default: 'ams1'
+
     option "--billing", "BILLING", "Billing cycle", default: 'hourly'
-    option "--ssh-key", "PATH", "Path to ssh public key (optional)"
+    option "--ssh-key", "PATH", "Path to ssh public key", default: File.join(Dir.home, '.ssh', 'id_rsa.pub')
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
@@ -18,7 +24,7 @@ module Kontena::Plugin::Packet::Nodes
 
       require_relative '../../../machine/packet'
       grid = fetch_grid
-      provisioner = provisioner(client(require_token), token)
+      provisioner = provisioner(client, token)
       provisioner.run!(
         master_uri: api_url,
         grid_token: grid['token'],
@@ -40,7 +46,7 @@ module Kontena::Plugin::Packet::Nodes
 
     # @return [Hash]
     def fetch_grid
-      client(require_token).get("grids/#{current_grid}")
+      client.get("grids/#{current_grid}")
     end
   end
 end

data/lib/kontena/plugin/packet/project_option.rb

@@ -0,0 +1,37 @@
+module Kontena::Plugin::Packet
+  module ProjectOption
+
+    def self.included(base)
+      base.option "--project", "PROJECT_ID", "Packet project ID", environment_variable: 'PACKET_PROJECT'
+      base.class_eval do
+        def default_project
+          require 'packet'
+
+          client = Packet::Client.new(self.token || (self.respond_to?(:default_token) && self.default_token))
+
+          projects = []
+          spinner "Retrieving a list of available projects on Packet" do
+            projects = client.list_projects
+          end
+
+          case projects.size
+          when 0
+            abort 'You do not have access to any projects on Packet'
+          when 1
+            unless Kontena.prompt.yes?("You have access to project '#{projects.first.name}'. Use?")
+              abort 'Aborted'
+            end
+            projects.first.id
+          else
+            Kontena.prompt.select "Packet project:" do |menu|
+              projects.each do |project|
+                menu.choice project.name, project.id
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena/plugin/packet/token_option.rb

@@ -0,0 +1,12 @@
+module Kontena::Plugin::Packet
+  module TokenOption
+    def self.included(base)
+      base.option "--token", "TOKEN", "Packet API token", environment_variable: 'PACKET_TOKEN'
+      base.class_eval do
+        def default_token
+          Kontena.prompt.ask("Packet API token:")
+        end
+      end
+    end
+  end
+end

data/lib/kontena/plugin/packet/type_option.rb

@@ -0,0 +1,47 @@
+module Kontena::Plugin::Packet
+  module TypeOption
+
+    def self.included(base)
+      base.option "--type", "SLUG", "Packet server plan type", attribute_name: :plan
+      base.class_eval do
+        def default_project
+          require 'packet'
+
+          client = Packet::Client.new(self.token || (self.respond_to?(:default_token) && self.default_token))
+
+          plans = []
+          spinner "Retrieving a list of available plans at Packet" do
+            plans = client.list_plans
+          end
+
+          case plans.size
+          when 0
+            abort 'You do not have access to any plans on Packet'
+          when 1
+            unless Kontena.prompt.yes?("You have access to plan '#{plans.first.name}'. Use?")
+              abort 'Aborted'
+            end
+            plans.first.slug
+          else
+            puts
+            puts pastel.bright_blue("Packet plans:")
+            puts
+            plans.each do |plan|
+              puts pastel.green("  #{"%-11s" % "#{plan.name}:"}")
+              puts pastel.bright_blue("     #{plan.description}")
+            end
+            puts
+
+            Kontena.prompt.select "Packet plan:" do |menu|
+              plans.each do |plan|
+                menu.choice plan.name, plan.slug
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-packet
 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -90,12 +90,16 @@ files:
 - lib/kontena/machine/packet/node_restarter.rb
 - lib/kontena/machine/packet/packet_common.rb
 - lib/kontena/plugin/packet.rb
+- lib/kontena/plugin/packet/facility_option.rb
 - lib/kontena/plugin/packet/master/create_command.rb
 - lib/kontena/plugin/packet/master_command.rb
 - lib/kontena/plugin/packet/node_command.rb
 - lib/kontena/plugin/packet/nodes/create_command.rb
 - lib/kontena/plugin/packet/nodes/restart_command.rb
 - lib/kontena/plugin/packet/nodes/terminate_command.rb
+- lib/kontena/plugin/packet/project_option.rb
+- lib/kontena/plugin/packet/token_option.rb
+- lib/kontena/plugin/packet/type_option.rb
 - lib/kontena/plugin/packet_command.rb
 - lib/kontena_cli_plugin.rb
 homepage: https://github.com/kontena/kontena-plugin-packet
@@ -113,9 +117,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