vagrant-orchestrate 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e792cb68c033c004720ce8142c97148c62d3d3b3
-  data.tar.gz: f923b195cde3ae62356f3acd78419f829859cb03
+  metadata.gz: daf8bdc44383203b8cc60e708fbd4ef931c88897
+  data.tar.gz: 2917a0107512412d3c210c78fd1ba0c10e895d19
 SHA512:
-  metadata.gz: a4a923bbb339a50c8660a98b47e0622890f6a5857514ad93e262d0de7215cc6edda47a11b0732aea3499aca8160044b19081e4b5feeb456be80e10cbdd016ee4
-  data.tar.gz: cc35054d935113db19f082744ac4a2d4eb720765ddcb55bde0dd098d021b1d2e98d3d7931a70750b9f50d48d7290b4e1b3117297e59a7243c90e10f99bc96d11
+  metadata.gz: 90e979ed582054c9f26c9458779103ca7f30230b5733843e57f46f4cae8932f8024abc00aa9eaf02c7042996761554842afeb99a04c7fe652c0a2f816b8db146
+  data.tar.gz: cf23917f10e5672b2372690dcf57ee61d6a1135ee44a503d709c8753475e4d944d6da01e7227b027612dfc15cb59152fd4b5c3b44b40f194af7861906c215f90

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.6.0 (May 15th, 2015)
+
+  - Refactor the push command to compose middleware actions rather than performing
+  a bunch of work in the command itself. This means that a push using the `parallel`
+  strategy will truly be parallel per box, as opposed to the old implementation where
+  the `up`, `provision`, `upload_stats`, and `destroy` phases would each happen in
+  parallel, but the phases would be done in series.
+  - Change the `vagrant orchestrate status` command so that it will run in parallel.
+  - Add `vagrant-orchestrate` as a default required plugin. Someone will have to
+  install it "by hand" to access the init functionality, but other users pulling
+  down a repo with a committed Vagrantfile will not, making each repo more self-contained.
+
 0.5.3 (May 13th, 2015)
 
   - Fix a bug where the VAGRANT_ORCHESTRATE_USERNAME and VAGRANT_ORCHESTRATE_PASSWORD

data/README.md

@@ -205,6 +205,8 @@ You'll need to bootstrap the target machine. The following script should get you
 winrm quickconfig
 winrm set winrm/config/service/auth @{Negotiate="true"}
 winrm set winrm/config/service @{AllowUnencrypted="false"}
+winrm set winrm/config/winrs @{MaxShellsPerUser="25"}
+winrm set winrm/config/winrs @{MaxConcurrentUsers="25"}
 sc config winrm start= auto
 sc config winrm type= own
 ```

data/lib/vagrant-managed-servers/action.rb

@@ -0,0 +1,31 @@
+# It is useful to be able to call up, provision, reload, and destroy as a single
+# unit - it makes things like parallel provisioning more seamless and provides
+# a useful action hook for the push command.
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      include Vagrant::Action::Builtin
+
+      def self.action_push
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use action_up
+          b.use Call, action_provision do |env, b2|
+            if env[:reboot]
+              b2.use Call, action_reload do |_env, _b3|
+              end
+            end
+          end
+          b.use UploadStatus
+          b.use action_destroy
+        end
+      end
+
+      def self.action_download_status
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use DownloadStatus
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-managed-servers/action/download_status.rb

@@ -0,0 +1,38 @@
+require "log4r"
+
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class DownloadStatus
+        def initialize(app, _env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_managed_servers::action::print_status")
+        end
+
+        def call(env)
+          download_status(env[:machine], env[:local_file_path], env[:remote_file_path], env[:ui])
+
+          @app.call(env)
+        end
+
+        def download_status(machine, local, remote, ui)
+          machine.communicate.wait_for_ready(5)
+          @logger.debug("Downloading orchestrate status for #{machine.name}")
+          @logger.debug("  remote file: #{remote}")
+          @logger.debug("  local file: #{local}")
+          machine.communicate.download(remote, local)
+          content = File.read(local)
+          @logger.debug("File content:")
+          @logger.debug(content)
+          status = JSON.parse(content)
+          ENV["VAGRANT_ORCHESTRATE_STATUS"] += machine.name.to_s + "   " + status["last_sync"] + \
+                                               "  " + status["ref"] + "  " + status["user"] + "\n"
+        rescue => ex
+          ui.warn("Error downloading status for #{machine.name}.")
+          ui.warn(ex.message)
+          ENV["VAGRANT_ORCHESTRATE_STATUS"] += machine.name.to_s + "   Status unavailable.\n"
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-managed-servers/action/upload_status.rb

@@ -0,0 +1,41 @@
+require "log4r"
+
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class UploadStatus
+        def initialize(app, _env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_managed_servers::action::upload_status")
+        end
+
+        def call(env)
+          upload_status(env[:status], env[:machine], env[:ui])
+
+          @app.call(env)
+        end
+
+        def upload_status(status, machine, ui)
+          source = status.local_path
+          destination = status.remote_path(machine.config.vm.communicator)
+          parent_folder = File.split(destination)[0]
+          machine.communicate.wait_for_ready(5)
+          @logger.debug("Ensuring vagrant_orchestrate status directory exists")
+          machine.communicate.sudo("mkdir -p #{parent_folder}")
+          machine.communicate.sudo("chmod 777 #{parent_folder}")
+          ui.info("Uploading vagrant orchestrate status")
+          @logger.debug("Uploading vagrant_orchestrate status")
+          @logger.debug("  source: #{source}")
+          @logger.debug("  dest: #{destination}")
+          machine.communicate.upload(source, destination)
+          @logger.debug("Setting uploaded file world-writable")
+          machine.communicate.sudo("chmod 777 #{destination}")
+        rescue => ex
+          @logger.error(ex)
+          ui.warn("An error occurred when trying to upload status to #{machine.name}. Continuing")
+          ui.warn(ex.message)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-orchestrate/command/init.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
         DEFAULT_WINRM_PASSWORD = "{{YOUR_WINRM_PASSWORD}}"
         DEFAULT_SSH_USERNAME = "{{YOUR_SSH_USERNAME}}"
         DEFAULT_SSH_PRIVATE_KEY_PATH = "{{YOUR_SSH_PRIVATE_KEY_PATH}}"
-        DEFAULT_PLUGINS = ["vagrant-managed-servers"]
+        DEFAULT_PLUGINS = ["vagrant-orchestrate", "vagrant-managed-servers"]
 
         # rubocop:disable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def execute

data/lib/vagrant-orchestrate/command/push.rb

@@ -1,6 +1,8 @@
 require "English"
 require "optparse"
 require "vagrant"
+require "vagrant-managed-servers/action/upload_status"
+require_relative "../../vagrant-managed-servers/action"
 require "vagrant-orchestrate/action/setcredentials"
 require "vagrant-orchestrate/repo_status"
 require_relative "command_mixins"
@@ -60,6 +62,12 @@ module VagrantPlugins
 
           retrieve_creds(machines) if @env.vagrantfile.config.orchestrate.credentials
 
+          # Write the status file to disk so that it can be used as part of the
+          # push action.
+          status = RepoStatus.new
+          status.write(@env.tmp_path)
+          options[:status] = status
+
           options[:parallel] = true
           strategy = options[:strategy] || @env.vagrantfile.config.orchestrate.strategy
           @env.ui.info("Pushing to managed servers using #{strategy} strategy.")
@@ -115,13 +123,11 @@ module VagrantPlugins
             end
             ENV["VAGRANT_ORCHESTRATE_COMMAND"] = "PUSH"
             begin
-              batchify(machines, :up, options)
-              batchify(machines, :provision, options) if options[:provision]
-              upload_status_all(machines)
-              batchify(machines, :reload, options) if options[:reboot]
+              batchify(machines, :push, options)
             ensure
-              batchify(machines, :destroy, options)
               @logger.debug("Finished orchestrating push to group number #{index + 1} of #{groups.size}.")
+              status_source = options[:status].local_path
+              super_delete(status_source) if File.exist?(status_source)
               ENV.delete "VAGRANT_ORCHESTRATE_COMMAND"
             end
 
@@ -147,6 +153,9 @@ module VagrantPlugins
         def batchify(machines, action, options)
           @env.batch(options[:parallel]) do |batch|
             machines.each do |machine|
+              # This is necessary to disable the low level provisioning in the
+              # Vagrant builtin provisioner.
+              options[:provision_enabled] = false unless options[:provision]
               batch.action(machine, action, options)
             end
           end
@@ -170,36 +179,6 @@ module VagrantPlugins
           message = "ERROR!\nThere are files that need to be committed first."
           RepoStatus.clean? && RepoStatus.committed? && !RepoStatus.untracked? || abort(message)
         end
-
-        def upload_status_all(machines)
-          status = RepoStatus.new
-          source = File.join(@env.tmp_path, "vagrant_orchestrate_status")
-          File.write(source, status.to_json)
-          machines.each do |machine|
-            upload_status_one(source, status, machine)
-          end
-        ensure
-          super_delete(source) if File.exist?(source)
-        end
-
-        def upload_status_one(source, status, machine)
-          destination = status.remote_path(machine.config.vm.communicator)
-          parent_folder = File.split(destination)[0]
-          machine.communicate.wait_for_ready(5)
-          @logger.debug("Ensuring vagrant_orchestrate status directory exists")
-          machine.communicate.sudo("mkdir -p #{parent_folder}")
-          machine.communicate.sudo("chmod 777 #{parent_folder}")
-          @logger.debug("Uploading vagrant_orchestrate status file")
-          @logger.debug("  source: #{source}")
-          @logger.debug("  dest: #{destination}")
-          machine.communicate.upload(source, destination)
-          @logger.debug("Setting uploaded file world-writable")
-          machine.communicate.sudo("chmod 777 #{destination}")
-        rescue => ex
-          @logger.error(ex)
-          @env.ui.warn("An error occurred when trying to upload status to #{machine.name}. Continuing")
-          @env.ui.warn(ex.message)
-        end
       end
     end
   end

data/lib/vagrant-orchestrate/command/status.rb

@@ -1,6 +1,8 @@
 require "json"
 require "optparse"
 require "vagrant"
+require "vagrant-managed-servers/action/download_status"
+require_relative "../../vagrant-managed-servers/action"
 require "vagrant-orchestrate/repo_status"
 require_relative "command_mixins"
 
@@ -32,36 +34,26 @@ module VagrantPlugins
           # There is some detail output fromt he communicator.download that I
           # don't want to suppress, but I also don't want it to be interspersed
           # with the actual status information. Let's buffer the status output.
-          output = []
+          ENV["VAGRANT_ORCHESTRATE_STATUS"] = ""
           @logger.debug("About to download machine status")
-          machines.each do |machine|
-            output << get_status(RepoStatus.new.remote_path(machine.config.vm.communicator), machine)
+          options = {}
+          parallel = true
+          local_files = []
+          @env.batch(parallel) do |batch|
+            machines.each do |machine|
+              options[:remote_file_path] = RepoStatus.new.remote_path(machine.config.vm.communicator)
+              options[:local_file_path] = File.join(@env.tmp_path, "#{machine.name}_status")
+              local_files << options[:local_file_path]
+              batch.action(machine, :download_status, options)
+            end
           end
           @env.ui.info("Current managed server states:")
           @env.ui.info("")
-          output.each do |line|
-            @env.ui.info line
-          end
-        end
-
-        def get_status(remote, machine)
-          machine.communicate.wait_for_ready(5)
-          local = File.join(@env.tmp_path, "#{machine.name}_status")
-          @logger.debug("Downloading orchestrate status for #{machine.name}")
-          @logger.debug("  remote file: #{remote}")
-          @logger.debug("  local file: #{local}")
-          machine.communicate.download(remote, local)
-          content = File.read(local)
-          @logger.debug("File content:")
-          @logger.debug(content)
-          status = JSON.parse(content)
-          return machine.name.to_s + "   " + status["last_sync"] + "  " + status["ref"] + "  " + status["user"]
-        rescue => ex
-          @env.ui.warn("Error downloading status for #{machine.name}.")
-          @env.ui.warn(ex.message)
-          return machine.name.to_s + "   Status unavailable."
+          @env.ui.info(ENV["VAGRANT_ORCHESTRATE_STATUS"].split("\n").sort.join("\n"))
         ensure
-          super_delete(local) if File.exist?(local)
+          local_files.each do |local|
+            super_delete(local) if File.exist?(local)
+          end
         end
       end
     end

data/lib/vagrant-orchestrate/repo_status.rb

@@ -4,9 +4,11 @@ module VagrantPlugins
   module Orchestrate
     class RepoStatus
       attr_reader :last_sync
+      attr_accessor :local_path
 
       def initialize
         @last_sync = Time.now.utc    # Managed servers could be in different timezones
+        @local_path = nil
       end
 
       def ref
@@ -47,6 +49,11 @@ module VagrantPlugins
         JSON.pretty_generate(contents)
       end
 
+      def write(tmp_path)
+        @local_path = File.join(tmp_path, "vagrant_orchestrate_status")
+        File.write(@local_path, to_json)
+      end
+
       # The path to where this should be stored on a remote machine, inclusive
       # of the file name.
       def remote_path(communicator)

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.5.3"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,9 @@ files:
 - docs/puppet.md
 - docs/strategy.md
 - dummy.box
+- lib/vagrant-managed-servers/action.rb
+- lib/vagrant-managed-servers/action/download_status.rb
+- lib/vagrant-managed-servers/action/upload_status.rb
 - lib/vagrant-orchestrate.rb
 - lib/vagrant-orchestrate/action/filtermanaged.rb
 - lib/vagrant-orchestrate/action/setcredentials.rb