vagrant-skytap 0.2.2 → 0.2.3

data/_patches-20160118a/eng-10256-cr

@@ -1,314 +0,0 @@
-# HG changeset patch
-# Parent 330807f4d3365968e3172a68423b8ad5d9ff74c5
-ENG-10256 fixes based on CR
-
-diff -r 330807f4d336 lib/vagrant-skytap/action/clear_forwarded_ports.rb
---- a/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Fri Jan 15 15:39:01 2016 -0800
-+++ b/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -8,7 +8,7 @@
- 
-         def call(env)
-           env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
--          env[:host].capability(:kill_forwarded_ports, env)
-+          env[:host].capability(:kill_forwarded_ports, env[:machine])
- 
-           @app.call(env)
-         end
-diff -r 330807f4d336 lib/vagrant-skytap/action/forward_ports.rb
---- a/lib/vagrant-skytap/action/forward_ports.rb	Fri Jan 15 15:39:01 2016 -0800
-+++ b/lib/vagrant-skytap/action/forward_ports.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -21,7 +21,7 @@
- 
-           # Warn if we're port forwarding to any privileged ports...
-           env[:forwarded_ports].each do |fp|
--            if fp.host_port <= 1024
-+            if fp.privileged_host_port?
-               env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
-               break
-             end
-@@ -35,12 +35,12 @@
- 
-         def forward_ports
-           @env[:forwarded_ports].each do |fp|
--            unless fp.guest_port == 22 && fp.host_port == 2222
-+            unless fp.internal_ssh_port?
-               @env[:ui].detail(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry",
-                                         adapter: fp.adapter,
-                                         guest_port: fp.guest_port,
-                                         host_port: fp.host_port))
--              @env[:host].capability(:start_ssh_tunnel, fp, @env)
-+              @env[:host].capability(:start_ssh_tunnel, fp, @env[:machine], @env)
-             end
-           end
-         end
-diff -r 330807f4d336 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
---- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Fri Jan 15 15:39:01 2016 -0800
-+++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -1,9 +1,10 @@
-+# unused libs?
- require "pathname"
- require "tmpdir"
--require 'childprocess'
- require "vagrant/util/subprocess"
-+require "vagrant/util/safe_chdir"
-+require "vagrant-skytap/models/forwarded_port"
- require 'log4r'
--require "vagrant/util/safe_chdir"
- 
- module VagrantPlugins
-   module Skytap
-@@ -15,76 +16,96 @@
-               raise NotImplementedError
-             end
- 
--            def start_ssh_tunnel(env, fp, env_hash)
-+            # Create an ssh tunnel for the current machine
-+            # using the given [ForwardedPort] object.
-+            #
-+            # @return [Vagrant::Util::Subprocess::Result]
-+            def start_ssh_tunnel(env, fp, machine, env_hash)
-               logger = create_logger
--              machine = env_hash[:machine]
--              pidfile = pidfile_name(fp)
-+
-+              # just in case there's something left over
-+              env.host.capability(:kill_ssh_tunnel, fp, machine)
-+
-+              args = ssh_args(fp, machine, env_hash[:machine_ssh_info])
-+              vars = autossh_environment_variables(fp, machine)
-+              args << {env: vars}
-+              # ensure that we delete or overwrite any existing pidfile
-+              Vagrant::Util::Subprocess.execute("autossh", "-f", *args)
-+            end
-+
-+            # Kill the autossh process for the given [ForwardedPort]
-+            # (after confirming that it's not stale)
-+            #
-+            # @return [Vagrant::Util::Subprocess::Result]
-+            def kill_ssh_tunnel(env, fp, machine)
-+              logger = create_logger
-+              pidfile = fp.pidfile_name
-               pid = read_pid(machine.data_dir.join(pidfile))
--
--              if pid && autossh_pid?(pid)
--                logger.info("An autossh process already exists with pid #{pid}.")
-+              if pid && autossh_pid?(env, pid)
-+                Vagrant::Util::Subprocess.execute("kill", pid.to_s)
-               else
--                args = ssh_args(fp, env_hash)
--                vars = autossh_environment_variables(pidfile, env_hash)
--                args << {env: vars}
--                Vagrant::Util::Subprocess.execute("autossh", "-f", *args)
-+                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
-+                result = Vagrant::Util::Subprocess.execute("rm", machine.data_dir.join(pidfile).to_s)
-+                puts result.inspect
-+                false
-               end
-             end
- 
--            def kill_forwarded_ports(env, env_hash)
--              get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
--                kill_ssh_tunnel(env, pidfile, env_hash)
-+            # Convenience method which kills all autossh
-+            # processes for the given machine
-+            #
-+            # @return [Array] A list of the pidfiles which were
-+            # killed.
-+            def kill_forwarded_ports(env, machine)
-+              get_fp_for_machine(machine).each do |fp|
-+                env.host.capability(:kill_ssh_tunnel, fp, machine)
-               end
-+              # delete *.pid?
-             end
- 
--            def kill_ssh_tunnel(env, pidfile, env_hash)
--              logger = create_logger
--              machine = env_hash[:machine]
--              pid = read_pid(machine.data_dir.join(pidfile))
--              if pid && autossh_pid?(pid)
--                Vagrant::Util::Subprocess.execute("kill", pid.to_s)
--              else
--                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
--                Vagrant::Util::Subprocess.execute("rm", pidfile)
--              end
--            end
--
--
--            def pidfile_name(fp)
--              "#{fp.protocol}#{fp.host_port}.pid"
--            end
--
-+            # Reads the pid from the given pidfile_path (full
-+            # path, not relative to the machine data_dir)
-+            #
-+            # @return [Integer], or nil if not found.
-             def read_pid(pidfile_path)
-               File.read(pidfile_path).presence.try(:to_i) if File.exist?(pidfile_path)
-             end
- 
--            def get_pidfiles_for_machine(machine)
-+            # Reads all the pidfiles from the machine's data_dir.
-+            # TODO make this return [ForwardedPort] objects
-+            #
-+            # @return [Array] of [ForwardedPort] objects
-+            def get_fp_for_machine(machine)
-               pidfiles = []
-               Vagrant::Util::SafeChdir.safe_chdir(machine.data_dir) do
-                 pidfiles = Dir.glob("*.pid")
-               end
--              pidfiles
-+              pidfiles.collect do |pidfile|
-+                pidfile =~ /(\w+)(\d+)\.pid/
-+                protocol, hostport, guestport = $1, $2, nil
-+                ForwardedPort.new("#{protocol}#{hostport}", hostport, guestport, protocol: protocol)
-+              end
-             end
- 
--            # Checks that the pid is actually an autossh process (and not
--            # something else using a recycled pid).
--            def autossh_pid?(pid)
--              # get_comm_for_pid(pid) == 'autossh'
--              true
-+            # Determines whether the given pid corresponds to a running
-+            # autossh process.
-+            #
-+            # @return [Boolean]
-+            def autossh_pid?(env, pid)
-+              begin
-+                env.host.capability(:get_comm_for_pid, pid) == 'autossh'
-+              rescue NotImplementedError, Vagrant::Errors::CapabilityNotFound => ex
-+                create_logger.info("Could not confirm that the given pid corresponds to a running autossh process.")
-+                false
-+              end
-             end
- 
--            # Get the command, minus any arguments, for the given
--            # pid. This probably needs to be overridden per host cap
--            def get_comm_for_pid(pid)
--              result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
--              result.stdout.split("\n").last
--            end
--
--            # these args seem to work on MacOS and Ubuntu ...
--            # untested on other implementations
--            def ssh_args(fp, env_hash)
--              machine = env_hash[:machine]
--              ssh_info = env_hash[:machine_ssh_info]
-+            # Gets the args to be passed to ssh for the given
-+            # [ForwardedPort] on the given machine.
-+            #
-+            # @return [Array]
-+            def ssh_args(fp, machine, ssh_info)
-+              # TODO read ssh_info without having to pass it in
-               ssh_options = {
-                 "ServerAliveInterval" => 10,
-                 "ServerAliveCountMax" => 3,
-@@ -103,10 +124,13 @@
-               args << "#{ssh_info[:username]}@#{ssh_info[:host]}"
-             end
- 
--            def autossh_environment_variables(pidfile, env_hash, monitoring_port = 0)
--              machine = env_hash[:machine]
-+            # Gets the environment variables to be set when calling
-+            # autossh.
-+            #
-+            # @return [Hash]
-+            def autossh_environment_variables(fp, machine, monitoring_port = 0)
-               {
--                "AUTOSSH_PIDFILE" => machine.data_dir.join(pidfile).to_s,
-+                "AUTOSSH_PIDFILE" => machine.data_dir.join(fp.pidfile_name).to_s,
-                 "AUTOSSH_PORT" => monitoring_port,
-               }
-             end
-diff -r 330807f4d336 lib/vagrant-skytap/hosts/darwin/cap/ssh_tunnel.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/hosts/darwin/cap/ssh_tunnel.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -0,0 +1,44 @@
-+require "vagrant-skytap/hosts/common/cap/ssh_tunnel"
-+
-+module VagrantPlugins
-+  module Skytap
-+    module HostDarwin
-+      module Cap
-+        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
-+          class << self
-+            def create_logger
-+              Log4r::Logger.new("vagrant::hosts::darwin")
-+            end
-+
-+#            def start_ssh_tunnel(*args)
-+#              debugger
-+#              raise NotImplementedError
-+#            end
-+#
-+#            def kill_ssh_tunnel(*args)
-+#              debugger
-+#              raise NotImplementedError
-+#            end
-+#
-+#            def kill_forwarded_ports(*args)
-+#              debugger
-+#              raise NotImplementedError
-+#            end
-+
-+            # Gets the name of the executable for the given pid.
-+            #
-+            # @return [String]
-+            def get_comm_for_pid(pid)
-+              logger = create_logger
-+              debugger
-+              result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
-+              logger.info result.inspect
-+              logger.info result.stdout
-+              result.stdout.split("\n").last
-+            end
-+          end
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 330807f4d336 lib/vagrant-skytap/hosts/ubuntu/cap/ssh_tunnel.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/hosts/ubuntu/cap/ssh_tunnel.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -0,0 +1,15 @@
-+require "vagrant-skytap/hosts/common/cap/ssh_tunnel"
-+
-+module VagrantPlugins
-+  module Skytap
-+    module HostUbuntu
-+      module Cap
-+        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
-+          def self.create_logger
-+            Log4r::Logger.new("vagrant::hosts::ubuntu")
-+          end
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 330807f4d336 lib/vagrant-skytap/model/forwarded_port.rb
---- a/lib/vagrant-skytap/model/forwarded_port.rb	Fri Jan 15 15:39:01 2016 -0800
-+++ b/lib/vagrant-skytap/model/forwarded_port.rb	Mon Jan 18 13:37:48 2016 -0800
-@@ -64,6 +64,21 @@
-         def correct_host_port(new_port)
-           @host_port = new_port
-         end
-+
-+        # Returns a filename suitable for use as a pidfile.
-+        #
-+        # @return [String]
-+        def pidfile_name
-+          "#{protocol}#{host_port}.pid"
-+        end
-+
-+        def privileged_host_port?
-+          host_port <= 1024
-+        end
-+
-+        def internal_ssh_port?
-+          guest_port == 22 && host_port == 2222
-+        end
-       end
-     end
-   end

data/_patches-20160118a/eng-10256-ubuntu-testing

@@ -1,88 +0,0 @@
-# HG changeset patch
-# Parent 9b3dc8dd5d19d0effc35672a8e3bbeb50ef381a8
-DO NOT COMMIT. Vagrantfile for testing on Ubuntu VM.
-
-diff -r 9b3dc8dd5d19 eng-10256/Vagrantfile
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/eng-10256/Vagrantfile	Wed Jan 06 15:54:52 2016 -0800
-@@ -0,0 +1,44 @@
-+# Vagrantfile for creating an Ubuntu "master" VM with Vagrant installed
-+
-+SKYTAP_PROVIDER_GEM_PATH = "../vagrant-skytap-0.1.13.pre1.gem"
-+
-+$script_install_packages = <<SCRIPT
-+  sudo apt-get update
-+  sudo apt-get install -y autossh lynx-cur
-+SCRIPT
-+
-+$script_vagrant = <<SCRIPT
-+  which vagrant
-+  if [ $? -ne 0 ]; then
-+    wget https://releases.hashicorp.com/vagrant/1.8.0/vagrant_1.8.0_x86_64.deb -q0
-+    dpkg -i vagrant_1.8.0_x86_64.deb
-+  fi
-+SCRIPT
-+
-+Vagrant.configure(2) do |config|
-+  config.vm.box = "skytap/empty"
-+  config.vm.synced_folder ".", "/vagrant", disabled: true
-+
-+  config.vm.provider :skytap do |skytap, override|
-+    skytap.username  = "username"
-+    skytap.api_token = "00BADBEE"
-+    skytap.vpn_url   = "/vpns/vpn-711360"
-+  end
-+
-+  config.vm.define "vm1" do |box|
-+    box.vm.provider :skytap do |box|
-+      box.vm_url = "/vms/6869434"
-+    end
-+
-+    box.ssh.username = "skytap"
-+    box.ssh.password = "ChangeMe!"
-+
-+    box.vm.provision "shell", inline: "touch this_is_master"
-+    box.vm.provision "shell", inline: $script_install_packages
-+    box.vm.provision "shell", inline: $script_vagrant
-+    box.vm.provision "file",  source: "vagrantfile_master", destination: "project/Vagrantfile"
-+
-+    box.vm.provision "file",  source: SKYTAP_PROVIDER_GEM_PATH, destination: "vagrant-skytap.gem"
-+    box.vm.provision "shell", inline: "vagrant plugin install vagrant-skytap.gem", privileged: false
-+  end
-+end
-diff -r 9b3dc8dd5d19 eng-10256/vagrantfile_master
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/eng-10256/vagrantfile_master	Wed Jan 06 15:54:52 2016 -0800
-@@ -0,0 +1,32 @@
-+# Vagrantfile for creating Ubuntu "slave" VM
-+# This should be run on the "master" VM
-+
-+$script_install_packages = <<SCRIPT
-+  sudo apt-get update
-+  sudo apt-get install -y apache2 lynx-cur
-+SCRIPT
-+
-+Vagrant.configure(2) do |config|
-+  config.vm.box = "skytap/empty"
-+  config.vm.synced_folder ".", "/vagrant", disabled: true
-+
-+  config.vm.provider :skytap do |skytap, override|
-+    skytap.username  = "username"
-+    skytap.api_token = "00BADBEE"
-+    skytap.vpn_url   = "/vpns/vpn-711360"
-+  end
-+
-+  config.vm.define "vm1" do |box|
-+    box.vm.provider :skytap do |box|
-+      box.vm_url = "/vms/6869434"
-+    end
-+    box.ssh.username    = "skytap"
-+    box.ssh.password    = "ChangeMe!"
-+
-+    box.vm.provision "shell", inline: "touch this_is_slave"
-+    box.vm.provision "shell", inline: $script_install_packages
-+
-+    box.vm.network :forwarded_port, guest: 80, host: 8080
-+  end
-+end
-+

data/_patches-20160118a/eng-10269-test-stuff

@@ -1,87 +0,0 @@
-# HG changeset patch
-# Parent 6547dde950c57c1f4694245d8a41ab5a5a8b7d28
-improvements to tests for ENG-10269.  sighhhhhhh.  This will not be ready when the main patch is ready, just live with it.
-
-diff -r 6547dde950c5 lib/vagrant-skytap/action/read_state.rb
---- a/lib/vagrant-skytap/action/read_state.rb	Wed Nov 25 18:56:41 2015 -0800
-+++ b/lib/vagrant-skytap/action/read_state.rb	Mon Nov 30 11:51:41 2015 -0800
-@@ -17,6 +17,7 @@
-         end
- 
-         def call(env)
-+          debugger
-           env[:machine_state_id] = read_state(env[:machine])
- 
-           @app.call(env)
-diff -r 6547dde950c5 spec/acceptance/provider/up_spec.rb
---- a/spec/acceptance/provider/up_spec.rb	Wed Nov 25 18:56:41 2015 -0800
-+++ b/spec/acceptance/provider/up_spec.rb	Mon Nov 30 11:51:41 2015 -0800
-@@ -19,6 +19,15 @@
-   it 'should bring up the machine and halt it' do
-     status("Test: machine can be brought up, parallel by default")
-     up_result = execute("vagrant", "up")
-+
-+    # up_result.stderr =~ /REST API call: PUT .*multiselect.*\[(.*)\]/
-+    #    (byebug) $1
-+    #    "\"7677382\""
-+    # assert exactly one match with two separate ids
-+    # could we make rest calls from this test? or get by without?
-+    #multiselect should occur once
-+    # vagrant status output?
-+
-     expect(up_result).to exit_with(0)
- 
-     status("Test: machine is running after up")
-@@ -30,6 +39,10 @@
-   it 'should bring up the machine and halt it' do
-     status("Test: machine can be brought up no parallel")
-     up_result = execute("vagrant", "up", "--no-parallel")
-+
-+#    up_result.stderr =~ /REST API call: PUT .*multiselect.*\[(.*)\]/
-+    # assert no match
-+
-     expect(up_result).to exit_with(0)
- 
-     status("Test: machine is running after up")
-@@ -37,4 +50,10 @@
-     expect(echo_result).to exit_with(0)
-     expect(echo_result.stdout).to match(/foo\n$/)
-   end
-+
-+  # what else to test?
-+  # 2 new vms. Provisioners should run on both.
-+  # Only one runstate API call should be made by default.
-+  # 2 vms, one new, one already running.
-+  # Parallelness should be discernible in the output.
- end
-diff -r 6547dde950c5 spec/acceptance/skeletons/generic/Vagrantfile
---- a/spec/acceptance/skeletons/generic/Vagrantfile	Wed Nov 25 18:56:41 2015 -0800
-+++ b/spec/acceptance/skeletons/generic/Vagrantfile	Mon Nov 30 11:51:41 2015 -0800
-@@ -2,14 +2,20 @@
-   config.vm.box = "skytap/empty"
- 
-   config.vm.provider :skytap do |skytap, override|
--    skytap.username = "user"
--    skytap.api_token = "9999999999999999999999"
--    skytap.base_url = "https://example.com/"
-+    skytap.vm_url  = "/vms/7285844"
-+    skytap.vpn_url = "/vpns/vpn-711360"
-+#    skytap.vpn_url = "/vpns/vpn-3195669"
-   end
- 
--  config.vm.define "vm1" do |ubuntu|
--    ubuntu.vm.provider :skytap do |box|
--      box.vm_url = "https://example.com/vms/1"
--    end
-+  config.vm.define "vm1" do |vm1|
-+    vm1.ssh.username = "skytap"
-+    vm1.ssh.password = "ChangeMe!"
-+    vm1.vm.provision "shell", inline: "echo '****** HALLO EVERYONE this is vm1 ******'"
-+  end
-+
-+  config.vm.define "vm2" do |vm2|
-+    vm2.ssh.username = "skytap"
-+    vm2.ssh.password = "ChangeMe!"
-+    vm2.vm.provision "shell", inline: "echo '****** HALLO EVERYONE this is vm2 ******'"
-   end
- end

data/_patches-20160118a/eng-10269-wtf

@@ -1,119 +0,0 @@
-# HG changeset patch
-# Parent b774dc85ccd962a862c877e9a4c3fe3684c344e5
-ENG-10269 parallel halt operation
-
-diff -r b774dc85ccd9 lib/vagrant-skytap/action/fetch_environment.rb
---- a/lib/vagrant-skytap/action/fetch_environment.rb	Mon Nov 16 15:45:01 2015 -0800
-+++ b/lib/vagrant-skytap/action/fetch_environment.rb	Mon Nov 16 15:45:23 2015 -0800
-@@ -21,6 +21,7 @@
-               rescue Errors::DoesNotExist => ex
-                 @logger.info("Ignoring missing environment '#{props['url']}'.")
-               end
-+              # env[:environment_fetched] = true # this might be useful, come back to it
-             end
-           end
- 
-diff -r b774dc85ccd9 lib/vagrant-skytap/action/stop_vm.rb
---- a/lib/vagrant-skytap/action/stop_vm.rb	Mon Nov 16 15:45:01 2015 -0800
-+++ b/lib/vagrant-skytap/action/stop_vm.rb	Mon Nov 16 15:45:23 2015 -0800
-@@ -24,17 +24,36 @@
-         end
- 
-         def call(env)
--          vm = env[:environment].current_vm
--          if env[:force_halt]
--            vm.poweroff!
-+          # Is this stale, I wonder?
-+          case state = env[:machine_state_id]
-+          when :not_created
-+            env[:ui].info(I18n.t("vagrant_skytap.not_created"))
-+          when :stopped
-+            env[:ui].info(I18n.t("vagrant_skytap.already_status", :status => "stopped"))
-+          when :suspended
-+            if env[:force_halt]
-+              stop = true
-+            else
-+              env[:ui].info(I18n.t("vagrant_skytap.cannot_halt_if_suspended"))
-+            end
-           else
--            begin
--              vm.stop!
--            rescue Errors::InstanceReadyTimeout
--              @logger.info(I18n.t("vagrant_skytap.graceful_halt_vm_failed"))
-+            stop = true
-+          end
-+
-+          if stop
-+            vm = env[:environment].current_vm
-+            if env[:force_halt]
-               vm.poweroff!
-+            else
-+              begin
-+                vm.stop!
-+              rescue Errors::InstanceReadyTimeout
-+                @logger.info(I18n.t("vagrant_skytap.graceful_halt_vm_failed"))
-+                vm.poweroff!
-+              end
-             end
-           end
-+
-           @app.call(env)
-         end
-       end
-diff -r b774dc85ccd9 lib/vagrant-skytap/command/halt.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/halt.rb	Mon Nov 16 15:45:23 2015 -0800
-@@ -0,0 +1,41 @@
-+require 'optparse'
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      class Halt < Vagrant.plugin("2", :command)
-+        def self.synopsis
-+          "stops the vagrant machine (hi mom)"
-+        end
-+
-+        def execute
-+          options = {}
-+          options[:force] = false
-+
-+          opts = OptionParser.new do |o|
-+            o.banner = "Usage: vagrant halt [options] [name]"
-+            o.separator ""
-+            o.separator "Options:"
-+            o.separator ""
-+
-+            o.on("-f", "--force", "Force shut down (equivalent of pulling power)") do |f|
-+              options[:force] = f
-+            end
-+          end
-+
-+          # Parse the options
-+          argv = parse_options(opts)
-+          return if !argv
-+
-+          @logger.debug("Halt command: #{argv.inspect} #{options.inspect}")
-+          with_target_vms(argv, reverse: true) do |vm|
-+            vm.action(:halt, force_halt: options[:force])
-+          end
-+
-+          # Success, exit status 0
-+          0
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r b774dc85ccd9 locales/en.yml
---- a/locales/en.yml	Mon Nov 16 15:45:01 2015 -0800
-+++ b/locales/en.yml	Mon Nov 16 15:45:23 2015 -0800
-@@ -42,6 +42,8 @@
-       The environment could not be halted gracefully. Forcing halt.
-     graceful_halt_vm_failed: |-
-       The VM could not be halted gracefully. Forcing halt.
-+    cannot_halt_if_suspended: |-
-+      A suspended VM cannot be halted without the --force flag.
- 
-     config:
-       username_required: