kontena-plugin-vagrant 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd348640f57159a47b8b61eaba11b8d1d2af24c
-  data.tar.gz: 03896a2c82123071a11ca65ade785bafb725929b
+  metadata.gz: f0dbdc24762c8928c570ff0545c4ba1ebc8d6690
+  data.tar.gz: 51cc5042201b2b9bc3094c79b2837426358c99ac
 SHA512:
-  metadata.gz: ecdea869808825ee3292875882196a9152efcfff2b3bf18c653476aac6f162b5f2d67847471b3d90b703958b96abba1e4fb00f742263ec937753631dc5d3cb7d
-  data.tar.gz: 43d4071b71ca6620213c86b09d436de5e31bc84a156a0fdb1ead7e041d44b675b38dbc2df01b8bfe45d365227055314de16c7089c3c9474b379d3cff2165022f
+  metadata.gz: d87836d142bfe4d4f8119cbdc5020db8443931b601a76319fffa2d79ec65cfaf6018fe32965a7fe5425b66cefc6d4921af5299f256aa119716b95788a73a0639
+  data.tar.gz: 96407999132af74c0d7c1834deac6a82f5326b6c5c110f5fd49ef4bce0d57ee1a9444c14f806d064f9511d42bd378023bd97d3cd88a5a33c1d0271084b3914ea

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
-# 0.1.2 (2016-08-31)
+## 0.3.0 (2017-07-13)
+
+- allow node IPs to be specified (#42)
+- fix & improve cloudinits (#45, #40)
+- remove vagrant from gemfile (#44)
+- improve error handling and output (#41, #7, #25)
+
+## 0.2.7 (2017-05-03)
+
+- fix vagrant master create --name (#37)
+- sync travis.yml ruby versions with CLI and only deploy on 2.4.1 (#39)
+
+## 0.1.2 (2016-08-31)
 
 - add provider labeling for nodes (#4)
 - add ExecStop to systemd units (#2)
 
-# 0.1.1 (2016-08-10)
+## 0.1.1 (2016-08-10)
 
 - first release as a plugin

data/Gemfile

@@ -4,7 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "listen", "~> 3.0.8"
   gem "rspec"
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.8.4"
 end

data/lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb

@@ -34,13 +34,16 @@ coreos:
         [Service]
         Restart=always
         RestartSec=5
-        ExecStartPre=/usr/bin/docker pull mongo:3.0
-        ExecStartPre=-/usr/bin/docker create --name=kontena-server-mongo-data mongo:3.0
+        TimeoutStartSec=0
+        ExecStartPre=/usr/bin/docker pull mongo:3.2
+        ExecStartPre=-/usr/bin/docker network create kontena
+        ExecStartPre=-/usr/bin/docker volume create kontena-server-mongo
         ExecStartPre=-/usr/bin/docker stop kontena-server-mongo
         ExecStartPre=-/usr/bin/docker rm kontena-server-mongo
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
-            --volumes-from=kontena-server-mongo-data \
-            mongo:3.0 mongod --smallfiles
+            -v kontena-server-mongo:/data/db \
+            --network kontena \
+            mongo:3.2
         ExecStop=/usr/bin/docker stop kontena-server-mongo
 
     - name: kontena-server-api.service
@@ -61,16 +64,18 @@ coreos:
         [Service]
         Restart=always
         RestartSec=5
+        TimeoutStartSec=0
         EnvironmentFile=/etc/kontena-server.env
         ExecStartPre=-/usr/bin/docker stop kontena-server-api
         ExecStartPre=-/usr/bin/docker rm kontena-server-api
+        ExecStartPre=-/usr/bin/docker network create kontena
         ExecStartPre=/usr/bin/docker pull kontena/server:${KONTENA_VERSION}
         ExecStart=/usr/bin/docker run --name kontena-server-api \
-            --link kontena-server-mongo:mongodb \
-            -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            -e MONGODB_URI=mongodb://kontena-server-mongo: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=<%= initial_admin_code %><% end %> \
+            --network kontena \
             -p 8080:9292 \
             kontena/server:${KONTENA_VERSION}
         ExecStop=/usr/bin/docker stop kontena-server-api

data/lib/kontena/machine/vagrant/Vagrantfile.node.rb.erb

@@ -17,7 +17,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "<%= name %>" do |docker|
     docker.vm.box = "coreos-<%= coreos_channel %>"
     docker.vm.box_url = "http://stable.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
+    <% if network_address == "dhcp" %>
     docker.vm.network "private_network", type: "dhcp"
+    <% else  %>
+    docker.vm.network "private_network", ip: "<%= network_address %>"
+    <% end %>
     docker.vm.hostname = "<%= name %>"
     docker.vm.provider "virtualbox" do |vb|
       vb.name = "<%= name %>"

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

@@ -11,7 +11,7 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16"'
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16" -s overlay2'
         Environment='DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs'
   - path: /etc/sysctl.d/99-inotify.conf
     owner: root
@@ -78,6 +78,7 @@ coreos:
         [Service]
         Restart=always
         RestartSec=5
+        TimeoutStartSec=0
         EnvironmentFile=/etc/kontena-agent.env
         ExecStartPre=-/usr/bin/docker stop kontena-agent
         ExecStartPre=-/usr/bin/docker rm kontena-agent

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

@@ -0,0 +1,21 @@
+require 'fileutils'
+require 'erb'
+require 'open3'
+require 'json'
+
+module Kontena
+  module Machine
+    module Vagrant
+      module Common
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+
+        def run_command(cmd)
+          exit $?.exitstatus unless system(cmd)
+        end
+      end
+    end
+  end
+end

data/lib/kontena/machine/vagrant/master_destroyer.rb

@@ -1,25 +1,18 @@
-require 'fileutils'
+require_relative 'common'
 
 module Kontena
   module Machine
     module Vagrant
       class MasterDestroyer
-
+        include Kontena::Machine::Vagrant::Common
         include Kontena::Cli::ShellSpinner
 
         def run!
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
           Dir.chdir(vagrant_path) do
-            spinner "Terminating Kontena Master from Vagrant " do
-              Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
-                while o = output.gets
-                  puts o if ENV['DEBUG']
-                end
-                if wait.value == 0
-                  FileUtils.remove_entry_secure(vagrant_path)
-                end
-              end
-            end
+            spinner "Triggering termination of Kontena Master from Vagrant"
+            run_command('vagrant destroy -f')
+            FileUtils.remove_entry_secure(vagrant_path)
           end
         end
       end

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

@@ -1,7 +1,4 @@
-require 'fileutils'
-require 'erb'
-require 'open3'
-require 'json'
+require_relative 'common'
 
 module Kontena
   module Machine
@@ -9,6 +6,7 @@ module Kontena
       class MasterProvisioner
         include RandomName
         include Kontena::Machine::Common
+        include Kontena::Machine::Vagrant::Common
         include Kontena::Cli::Common
         include Kontena::Cli::ShellSpinner
 
@@ -48,18 +46,19 @@ module Kontena
             coreos_channel: coreos_channel,
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
-          vagrant_data = erb(File.read(template), vars)
-          cloudinit = erb(File.read(cloudinit_template), vars)
-          File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
-          File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          spinner "Creating Vagrant config " do
+            vagrant_data = erb(File.read(template), vars)
+            cloudinit = erb(File.read(cloudinit_template), vars)
+            File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
+            File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          end
+
           Dir.chdir(vagrant_path) do
-            spinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
-              Open3.popen2("vagrant up") do |stdin, output, wait|
-                while o = output.gets
-                  print o if ENV['DEBUG']
-                end
-              end
-            end
+            spinner "Triggering CoreOS Container Linux box update"
+            run_command('vagrant box update')
+            spinner "Executing 'vagrant up'"
+            run_command('vagrant up')
+            spinner "'vagrant up' executed successfully"
           end
 
           spinner "Waiting for #{name.colorize(:cyan)} to start " do
@@ -67,7 +66,7 @@ module Kontena
           end
 
           master_version = nil
-          spinner "Retrieving Kontena Master version" do
+          spinner "Retrieving #{name.colorize(:cyan)} version" do
             master_version = JSON.parse(client.get(path: '/'))["version"] rescue nil
           end
 
@@ -82,10 +81,6 @@ module Kontena
           }
         end
 
-        def erb(template, vars)
-          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
-        end
-
         def master_running?
           client.get(path: '/').status == 200
         rescue

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

@@ -1,10 +1,11 @@
-require 'fileutils'
+require_relative 'common'
 
 module Kontena
   module Machine
     module Vagrant
       class NodeDestroyer
         include RandomName
+        include Kontena::Machine::Vagrant::Common
         include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
@@ -17,16 +18,9 @@ module Kontena
         def run!(grid, name)
           vagrant_path = "#{Dir.home}/.kontena/#{grid}/#{name}"
           Dir.chdir(vagrant_path) do
-            spinner "Terminating Vagrant machine #{name.colorize(:cyan)} " do
-              Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
-                while o = output.gets
-                  puts o if ENV['DEBUG']
-                end
-                if wait.value == 0
-                  FileUtils.remove_entry_secure(vagrant_path)
-                end
-              end
-            end
+            spinner "Triggering termination of Vagrant machine #{name.colorize(:cyan)}"
+            run_command('vagrant destroy -f')
+            FileUtils.remove_entry_secure(vagrant_path)
           end
           node = api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
           if node

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

@@ -1,12 +1,10 @@
-require 'fileutils'
-require 'erb'
-require 'open3'
-
+require_relative 'common'
 module Kontena
   module Machine
     module Vagrant
       class NodeProvisioner
         include RandomName
+        include Kontena::Machine::Vagrant::Common
         include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
@@ -33,24 +31,26 @@ module Kontena
             name: name,
             version: version,
             memory: opts[:memory] || 1024,
+            network_address: opts[:network_address],
             master_uri: opts[:master_uri],
             grid_token: opts[:grid_token],
             coreos_channel: opts[:coreos_channel],
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
-          vagrant_data = erb(File.read(template), vars)
-          cloudinit = erb(File.read(cloudinit_template), vars)
-          File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
-          File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          spinner "Generating Vagrant config" do
+            vagrant_data = erb(File.read(template), vars)
+            cloudinit = erb(File.read(cloudinit_template), vars)
+            File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
+            File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          end
+
           node = nil
           Dir.chdir(vagrant_path) do
-            spinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
-              Open3.popen2('vagrant up') do |stdin, output, wait|
-                while o = output.gets
-                  print o if ENV['DEBUG']
-                end
-              end
-            end
+            spinner "Triggering CoreOS Container Linux box update"
+            run_command('vagrant box update')
+            spinner "Executing 'vagrant up'"
+            run_command('vagrant up')
+            spinner "'vagrant up' executed successfully"
             spinner "Waiting for node #{name.colorize(:cyan)} to join grid #{grid.colorize(:cyan)} " do
               sleep 1 until node = node_exists_in_grid?(grid, name)
             end
@@ -67,10 +67,6 @@ module Kontena
           "#{super}-#{rand(1..99)}"
         end
 
-        def erb(template, vars)
-          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
-        end
-
         def node_exists_in_grid?(grid, name)
           api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
         end

data/lib/kontena/plugin/vagrant/master/restart_command.rb

@@ -4,17 +4,13 @@ module Kontena::Plugin::Vagrant::Master
 
     def execute
       require_relative '../../../machine/vagrant'
-      
+
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        spinner "Restarting Vagrant kontena-master " do
-          Open3.popen2('vagrant reload') do |stdin, output, wait|
-            while o = output.gets
-              print o if ENV['DEBUG']
-            end
-          end
-        end
+        spinner "Executing 'vagrant reload' for kontena-master"
+        exit $?.exitstatus unless system('vagrant reload')
+        spinner "Vagrant machine restarted"
       end
     end
   end

data/lib/kontena/plugin/vagrant/master/start_command.rb

@@ -4,17 +4,12 @@ module Kontena::Plugin::Vagrant::Master
 
     def execute
       require_relative '../../../machine/vagrant'
-      
+
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant node kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        spinner "Starting Vagrant machine kontena-master " do
-          Open3.popen2('vagrant up') do |stdin, output, wait|
-            while o = output.gets
-              print o if ENV['DEBUG']
-            end
-          end
-        end
+        spinner "Triggering 'vagrant up' for kontena-master"
+        exit $?.exitstatus unless system('vagrant up')
       end
     end
   end

data/lib/kontena/plugin/vagrant/master/stop_command.rb

@@ -4,17 +4,12 @@ module Kontena::Plugin::Vagrant::Master
 
     def execute
       require_relative '../../../machine/vagrant'
-      
+
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        spinner "Stopping Vagrant kontena-master " do
-          Open3.popen2('vagrant halt') do |stdin, output, wait|
-            while o = output.gets
-              print o if ENV['DEBUG']
-            end
-          end
-        end
+        spinner "Triggering 'vagrant halt' for kontena-master"
+        exit $?.exitstatus unless system('vagrant halt')
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Kontena::Plugin::Vagrant::Nodes
     parameter "[NAME]", "Node name"
     option "--instances", "AMOUNT", "How many nodes will be created"
     option "--memory", "MEMORY", "How much memory node has"
+    option "--network-address", "IP", "First IP address for the node(s)", default: 'dhcp'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--coreos-channel", "CHANNEL", "CoreOS release channel", default: 'stable'
 
@@ -20,6 +21,14 @@ module Kontena::Plugin::Vagrant::Nodes
 
       grid = fetch_grid
       provisioner = provisioner(client(require_token))
+
+      require 'ipaddr'
+      ip_address = if network_address == "dhcp"
+        nil
+      else
+        IPAddr.new network_address
+      end
+
       instance_count.to_i.times do |i|
         provisioner.run!(
           master_uri: api_url,
@@ -27,10 +36,13 @@ module Kontena::Plugin::Vagrant::Nodes
           grid: current_grid,
           name: name,
           instance_number: i + 1,
+          network_address: ip_address ? ip_address.to_s : "dhcp",
           memory: instance_memory,
           version: version,
           coreos_channel: coreos_channel
         )
+
+        ip_address = ip_address.succ if ip_address
       end
     end
 

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

@@ -14,13 +14,8 @@ module Kontena::Plugin::Vagrant::Nodes
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        spinner "Restarting Vagrant machine #{name.colorize(:cyan)} " do
-          Open3.popen2('vagrant reload') do |stdin, output, wait|
-            while o = output.gets
-              print o if ENV['DEBUG']
-            end
-          end
-        end
+        spinner "Triggering 'vagrant reload' for #{name.colorize(:cyan)}"
+        exit $?.exitstatus unless system('vagrant reload')
       end
     end
   end

data/lib/kontena/plugin/vagrant/nodes/start_command.rb

@@ -10,17 +10,12 @@ module Kontena::Plugin::Vagrant::Nodes
       require_current_grid
 
       require_relative '../../../machine/vagrant'
-      
+
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        spinner "Starting Vagrant machine #{name.colorize(:cyan)} " do
-          Open3.popen2('vagrant up') do |stdin, output, wait|
-            while o = output.gets
-              print o if ENV['DEBUG']
-            end
-          end
-        end
+        spinner "Triggering 'vagrant up' for #{name.colorize(:cyan)}"
+        exit $?.exitstatus unless system('vagrant up')
       end
     end
   end

data/lib/kontena/plugin/vagrant/nodes/stop_command.rb

@@ -10,17 +10,12 @@ module Kontena::Plugin::Vagrant::Nodes
       require_current_grid
 
       require_relative '../../../machine/vagrant'
-      
+
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-          spinner "Stopping Vagrant machine #{name.colorize(:cyan)} " do
-            Open3.popen2('vagrant halt') do |stdin, output, wait|
-              while o = output.gets
-                print o if ENV['DEBUG']
-              end
-            end
-          end
+        spinner "Triggering 'vagrant halt' for #{name.colorize(:cyan)}"
+        exit $?.exitstatus unless system('vagrant halt')
       end
     end
   end

data/lib/kontena/plugin/vagrant.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Vagrant
-      VERSION = "0.2.7"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -73,6 +73,7 @@ files:
 - lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb
 - lib/kontena/machine/vagrant/Vagrantfile.node.rb.erb
 - lib/kontena/machine/vagrant/cloudinit.yml
+- lib/kontena/machine/vagrant/common.rb
 - lib/kontena/machine/vagrant/master_destroyer.rb
 - lib/kontena/machine/vagrant/master_provisioner.rb
 - lib/kontena/machine/vagrant/node_destroyer.rb