vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118/port-forwarding-processes

@@ -0,0 +1,87 @@
+# HG changeset patch
+# Parent fe283b200076d7f296364e54d4426e3a9b643743
+processes host cap -- more harm than good?
+
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/hosts/common/cap/processes.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/hosts/common/cap/processes.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -0,0 +1,24 @@
++require 'log4r'
++
++module VagrantPlugins
++  module Skytap
++    module HostCommon
++      module Cap
++        class Processes
++          class << self
++            def create_logger
++              raise NotImplementedError
++            end
++
++            # Gets the name of the executable for the given pid.
++            #
++            # @return [String]
++            def get_comm_for_pid(pid)
++              raise NotImplementedException
++            end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/hosts/darwin/cap/processes.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/hosts/darwin/cap/processes.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -0,0 +1,32 @@
++require "vagrant-skytap/hosts/common/cap/processes"
++require "vagrant/util/subprocess"
++
++module VagrantPlugins
++  module Skytap
++    module HostDarwin
++      module Cap
++        class Processes < VagrantPlugins::Skytap::HostCommon::Cap::Processes
++          class << self
++            def create_logger
++              Log4r::Logger.new("vagrant::hosts::darwin")
++            end
++
++            # Gets the name of the executable for the given pid.
++            #
++            # @return [String]
++            def get_comm_for_pid(env, pid)
++              logger = create_logger
++              result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
++              if result.exit_code == 0
++                result.stdout.split("\n").last
++              else
++                logger.debug(result.inspect)
++                ''
++              end
++            end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Mon Jan 18 13:37:48 2016 -0800
++++ b/lib/vagrant-skytap/plugin.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -49,6 +49,15 @@
+         Cap::PublicAddress
+       end
+ 
++      %w[get_comm_for_pid].each do |cap|
++        # We're only registering this cap for OSes that
++        # we know return the correct result.
++        host_capability("darwin", cap) do
++          require_relative "hosts/darwin/cap/processes"
++          HostDarwin::Cap::Processes
++        end
++      end
++
+       %w[start_ssh_tunnel kill_ssh_tunnel kill_forwarded_ports].each do |cap|
+         host_capability("bsd", cap) do
+           require_relative "hosts/bsd/cap/ssh_tunnel"

data/_patches-20160118/read-state

@@ -0,0 +1,23 @@
+# HG changeset patch
+# Parent 8bcd0f98359d1e6e85b806f457755cbcc85255e4
+diff -r 8bcd0f98359d -r 22788fec55a7 lib/vagrant-skytap/action/read_state.rb
+--- a/lib/vagrant-skytap/action/read_state.rb	Thu Nov 19 11:24:44 2015 -0800
++++ b/lib/vagrant-skytap/action/read_state.rb	Thu Nov 19 11:24:49 2015 -0800
+@@ -22,14 +22,10 @@
+           @app.call(env)
+         end
+ 
++        # Assumes FetchEnvironment was called to populate env[:environment].
+         def read_state(machine)
+-          if VmProperties.read(machine.data_dir)
+-            if environment = env[:environment]
+-              environment.reload
+-            elsif props = API::Environment.properties(env)
+-              @logger.info("env[:environment] was not set!")
+-            end
+-
++          if environment = env[:environment]
++            environment.reload
+             if vm = environment.try(:current_vm)
+               return vm.runstate.to_sym
+             end

data/_patches-20160118/refactor-to-use-public_address-cap

@@ -0,0 +1,25 @@
+# HG changeset patch
+# Parent 37bcd8389c3f5d6e1d618b020c7decf7949a2f25
+diff -r 37bcd8389c3f -r febe6d83e803 lib/vagrant-skytap/action/prepare_nfs_settings.rb
+--- a/lib/vagrant-skytap/action/prepare_nfs_settings.rb	Wed Dec 02 17:37:41 2015 -0800
++++ b/lib/vagrant-skytap/action/prepare_nfs_settings.rb	Wed Dec 02 17:37:46 2015 -0800
+@@ -15,7 +15,7 @@
+ 
+           if using_nfs?
+             env[:nfs_host_ip] = read_host_ip
+-            env[:nfs_machine_ip] = read_machine_ip
++            env[:nfs_machine_ip] = machine.provider.capability(:public_address)
+           end
+ 
+           @app.call(env)
+@@ -35,10 +35,6 @@
+             @logger.debug "read_host_ip returning #{ret}"
+           end
+         end
+-
+-        def read_machine_ip
+-          machine.ssh_info[:host]
+-        end
+       end
+     end
+   end

data/_patches-20160118/series

@@ -0,0 +1,59 @@
+gem-pre-version
+local-configs-ignore
+debug-changes
+acceptance-test-runner
+gems-old
+vagrantfile
+vagrantfile-for-acceptance-tests
+CR-ABOVE-THIS-LINE
+CR-BELOW-THIS-LINE
+COMPLETED-ABOVE-THIS-LINE
+COMPLETED-BELOW-THIS-LINE
+WIP-ABOVE-THIS-LINE
+eng-10256
+eng-10256-cr
+port-forwarding-processes
+eng-13040
+eng-12720
+eng-10256-ubuntu-testing
+eng-12843
+test-vagrantfile-vm1
+eng-12235-override-refactor
+eng-12232-command-spec
+eng-12235
+frickin-vagrant-spec
+eng-12249
+cache-api-client-in-up
+eng-12301
+vagrantfiles-to-forget-what-they-are-for
+eng-12240
+vagrantfile-for-nick
+refactor-to-use-public_address-cap
+eng-10269-test-stuff
+demo-rails-app
+read-state
+eng-11616
+eng-11616-2
+eng-11616-actual
+eng-10269-wtf
+parallelization-maybe
+eng-10369
+vm-vanished
+eng-10369-tmp
+eng-11625a
+eng-11711
+network-unreachable
+eng-11442
+WIP-BELOW-THIS-LINE
+new-boxfile
+ansible-1
+misc
+vagrant-spec-mock-api
+eng-10919
+env-source
+eng-11177-fix-actions-requires
+dead-code-in-actions
+eng-10166-halt-spec
+vagrant-vmware-plugin
+test-move-env-data
+googles-specs

data/_patches-20160118/status

@@ -0,0 +1,13 @@
+813456f18a2d7810c0785efa925e2516a7fa5729:gem-pre-version
+7f14d802de4291b2efdc17b40fd0fe9c189e274d:local-configs-ignore
+f58d23763657d7390d29235fd709fc61ecc76490:debug-changes
+17a12e519015a5986884ee2bbeead0f7b3135ae7:acceptance-test-runner
+d1cb8fab445ff9d4913417f6cec1f399c8edda79:gems-old
+44e88c2d194ecc78aa8efdb55bea28d90bcc9147:vagrantfile
+6e203277c01d9617c0e124da8d2641f5ed0bfec2:vagrantfile-for-acceptance-tests
+5e5eb3471fc9f6c38f24b4f813a981063543f221:CR-ABOVE-THIS-LINE
+0237e8774c138da308c648254f00e3e1b69c3367:CR-BELOW-THIS-LINE
+ad1ff25e401370c9d1d974aac2d5795df27ca24f:COMPLETED-ABOVE-THIS-LINE
+40be46504011dabcf4bd458d9ecad34c48dcc8e0:COMPLETED-BELOW-THIS-LINE
+b669f28f24c6872c9a436d1673eea9be62f1f6b4:WIP-ABOVE-THIS-LINE
+c4f5983e2c63e1e0ca7b515308b5683f8d4c0967:eng-10256

data/_patches-20160118/test-move-env-data

@@ -0,0 +1,231 @@
+# HG changeset patch
+# Parent b53e5fb4613bca1379e20e6d91ee14addfca153a
+tests for separating environment data
+
+diff --git a/lib/vagrant-skytap/action/create_environment.rb b/lib/vagrant-skytap/action/create_environment.rb
+--- a/lib/vagrant-skytap/action/create_environment.rb
++++ b/lib/vagrant-skytap/action/create_environment.rb
+@@ -28,7 +28,8 @@
+         def call(env)
+           environment = API::Environment.create!(env, template_url)
+           env[:environment] = environment
+-          environment.global_properties.write('url' => environment.url)
++          write_environment_url(environment.url)
++          #environment.global_properties.write('url' => environment.url)
+           environment.wait_until_ready
+ 
+           #TODO:NLA What's the right way to get this set? And where? Does it need to be set at all?
+@@ -42,6 +43,10 @@
+         def template_url
+           env[:machine].provider_config.template_url
+         end
++
++        def write_environment_url(url)
++          env[:environment].global_properties.write('url' => url)
++        end
+       end
+     end
+   end
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,1 +1,7 @@
+-
++require "unit/support/dummy_communicator"
++require "unit/support/dummy_provider"
++require "unit/support/shared/base_context"
++require "unit/support/shared/action_synced_folders_context"
++require "unit/support/shared/capability_helpers_context"
++require "unit/support/shared/plugin_command_context"
++require "unit/support/shared/virtualbox_context"
+diff --git a/spec/support/isolated_environment.rb b/spec/support/isolated_environment.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/support/isolated_environment.rb
+@@ -0,0 +1,45 @@
++require "fileutils"
++require "pathname"
++require "tmpdir"
++
++require "log4r"
++
++# This class manages an isolated environment for Vagrant to
++# run in. It creates a temporary directory to act as the
++# working directory as well as sets a custom home directory.
++#
++# This class also provides various helpers to create Vagrantfiles,
++# boxes, etc.
++class IsolatedEnvironment
++  attr_reader :homedir
++  attr_reader :workdir
++
++  # Initializes an isolated environment. You can pass in some
++  # options here to configure runing custom applications in place
++  # of others as well as specifying environmental variables.
++  #
++  # @param [Hash] apps A mapping of application name (such as "vagrant")
++  #   to an alternate full path to the binary to run.
++  # @param [Hash] env Additional environmental variables to inject
++  #   into the execution environments.
++  def initialize
++    @logger = Log4r::Logger.new("test::isolated_environment")
++
++    # Create a temporary directory for our work
++    @tempdir = Dir.mktmpdir("vagrant")
++    @logger.info("Initialize isolated environment: #{@tempdir}")
++
++    # Setup the home and working directories
++    @homedir = Pathname.new(File.join(@tempdir, "home"))
++    @workdir = Pathname.new(File.join(@tempdir, "work"))
++
++    @homedir.mkdir
++    @workdir.mkdir
++  end
++
++  # This closes the environment by cleaning it up.
++  def close
++    @logger.info("Removing isolated environment: #{@tempdir}")
++    FileUtils.rm_rf(@tempdir)
++  end
++end
+diff --git a/spec/vagrant-skytap/config_spec.rb b/spec/unit/config_spec.rb
+rename from spec/vagrant-skytap/config_spec.rb
+rename to spec/unit/config_spec.rb
+diff --git a/spec/unit/create_environment_spec.rb b/spec/unit/create_environment_spec.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/unit/create_environment_spec.rb
+@@ -0,0 +1,81 @@
++require 'spec_helper'
++require 'vagrant-skytap/action/create_environment'
++
++describe VagrantPlugins::Skytap::Action::CreateEnvironment do
++  include_context "unit"
++
++  let(:iso_env) do
++    # We have to create a Vagrantfile so there is a root path
++    env = isolated_environment
++    env.vagrantfile("")
++    env.create_vagrant_env
++  end
++
++  #let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
++  let(:machine) do
++    iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
++      m.provider.stub(driver: driver)
++    end
++  end
++
++  #  let(:app) { nil }
++  #  let(:env) { {} }
++  #  subject(:action) { described_class.new(app, env) }
++  let(:env)    {{ machine: machine }}
++  let(:app)    { lambda { |*args| }}
++  let(:driver) { double("driver") }
++  let(:host)   { double("host") }
++
++  subject { described_class.new(app, env) }
++
++  before do
++    env[:test] = true
++    allow(machine.env).to receive(:host) { host }
++    allow(host).to receive(:capability).with(:nfs_installed) { true }
++  end
++
++
++  it "calls the next action in the chain" do
++    driver.stub(read_network_interfaces: {2 => {type: :hostonly, hostonly: "vmnet2"}})
++    driver.stub(read_host_only_interfaces: [{name: "vmnet2", ip: "1.2.3.4"}])
++    allow(driver).to receive(:read_guest_ip).with(1).and_return("2.3.4.5")
++
++    called = false
++    app = lambda { |*args| called = true }
++
++    action = described_class.new(app, env)
++    action.call(env)
++
++    expect(called).to eq(true)
++  end
++
++  #  describe '#template_url' do
++  #    subject(:args) { action.template_url }
++  #
++  #    context 'with no ssh options' do
++  #      let(:options) { [] }
++  #
++  #      it { should eql [] }
++  #    end
++  #
++  #    context 'with one option' do
++  #      let(:options) { ['StrictHostKeyChecking=no'] }
++  #      it { should eql ["-o 'StrictHostKeyChecking=no'"] }
++  #    end
++  #
++  #    context 'with multiple options' do
++  #      let(:options) { ['SHKC=no', 'Port=222'] }
++  #      it { should eql ["-o 'SHKC=no'", "-o 'Port=222'"] }
++  #    end
++  #  end
++
++  describe '#write_environment_url' do
++    subject(:args) { 'http://foo/bar' }
++
++    context 'whatever' do
++      #let(:options) { [] }
++
++      it { should eql 'http://foo/bar' }
++    end
++  end
++end
+diff --git a/spec/unit/environment_spec.rb b/spec/unit/environment_spec.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/unit/environment_spec.rb
+@@ -0,0 +1,23 @@
++require 'vagrant-skytap/api/environment'
++
++describe VagrantPlugins::Skytap::API::Environment do
++  let(:attrs) { {} }
++  let(:env) { {} }
++  let(:instance) { described_class.new(attrs, env) }
++
++  describe "#busy?" do
++    context "it is busy" do
++      let(:runstate)  { 'busy' }
++
++      #instance.busy?.should be_true
++    end
++
++
++#    context "it is stopped" do
++#      let(:runstate)  { 'stopped' }
++#
++#      instance.busy?.should be_false
++#    end
++
++  end
++end
+diff --git a/spec/vagrant-skytap/unit/support/dummy_communicator.rb b/spec/unit/support/dummy_communicator.rb
+rename from spec/vagrant-skytap/unit/support/dummy_communicator.rb
+rename to spec/unit/support/dummy_communicator.rb
+diff --git a/spec/vagrant-skytap/unit/support/dummy_provider.rb b/spec/unit/support/dummy_provider.rb
+rename from spec/vagrant-skytap/unit/support/dummy_provider.rb
+rename to spec/unit/support/dummy_provider.rb
+diff --git a/spec/vagrant-skytap/unit/support/isolated_environment.rb b/spec/unit/support/isolated_environment.rb
+rename from spec/vagrant-skytap/unit/support/isolated_environment.rb
+rename to spec/unit/support/isolated_environment.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/action_synced_folders_context.rb b/spec/unit/support/shared/action_synced_folders_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/action_synced_folders_context.rb
+rename to spec/unit/support/shared/action_synced_folders_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/base_context.rb b/spec/unit/support/shared/base_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/base_context.rb
+rename to spec/unit/support/shared/base_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/capability_helpers_context.rb b/spec/unit/support/shared/capability_helpers_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/capability_helpers_context.rb
+rename to spec/unit/support/shared/capability_helpers_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/plugin_command_context.rb b/spec/unit/support/shared/plugin_command_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/plugin_command_context.rb
+rename to spec/unit/support/shared/plugin_command_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/virtualbox_context.rb b/spec/unit/support/shared/virtualbox_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/virtualbox_context.rb
+rename to spec/unit/support/shared/virtualbox_context.rb

data/_patches-20160118/test-vagrantfile-vm1

@@ -0,0 +1,167 @@
+# HG changeset patch
+# Parent 0c6dac6a7f7675f19b0be8bd06286ac74627356c
+diff -r 0c6dac6a7f76 -r a12a5438b54d vm1/Vagrantfile
+--- a/vm1/Vagrantfile	Wed Dec 23 17:24:01 2015 -0800
++++ b/vm1/Vagrantfile	Wed Dec 23 17:24:39 2015 -0800
+@@ -1,148 +1,26 @@
+-vpns = {
+-  etrue_prod:            "/vpns/vpn-711360",
+-  etrue_test:            "/vpns/vpn-286952",
+-  vagrant_provider_test: "/vpns/vpn-3195669",
+-  jsmith_dev:            "/vpns/vpn-8797011425",
+-}
+-
+-base_urls = {
+-  prod: "https://cloud.skytap.com/",
+-  test: "https://test.skytap.com/",
+-  integ: "https://integ.skytap.com/",
+-  dev: "https://cloud.skytap.dev/",
+-}
+-
+-settings = {
+-  etrue_prod: {
+-    username:  "etrue",
+-    api_token: "fcb2620b72efddbc8239e25db9d812f510c7e166",
+-    base_url:  base_urls[:prod],
+-    vpn_url:   vpns[:etrue_prod],
+-  },
+-  etrue_test: {
+-    username:  "etrue",
+-    api_token: "d41e7b2f98b63844512c0d62d0e5496949d35f57",
+-    base_url:  base_urls[:test],
+-    vpn_url:   vpns[:etrue_test],
+-  },
+-  vagrant_provider_admin: {
+-    username:  "vagrant_provider_admin",
+-    api_token: "7c5718531a32eb90e92c804ce1f73da98be22cdf",
+-    base_url:  base_urls[:test],
+-    vpn_url:   vpns[:vagrant_provider_test],
+-  },
+-  jsmith_dev: {
+-    username:  "jsmith",
+-    api_token: "754be5220955f35840498340606b4dfa89f7eb61",
+-    base_url:  base_urls[:dev],
+-    vpn_url:   vpns[:jsmith_dev],
+-  },
+-}
+-
+-vms = {
+-  golden: {
+-    vm_url: "https://cloud.skytap.com/vms/6869434"
+-  },
+-  nick_for_bootcamp: {
+-    vm_url: "https://cloud.skytap.com/vms/7878190",
+-  },
+-  take1: {
+-    vm_url:   "https://test.skytap.com/vms/6984688",
+-    username: "autoadmin",
+-    password: "autoadmin",
+-  },
+-  ubuntu1:             {
+-    vm_url: "https://cloud.skytap.com/vms/7285844"
+-  },
+-  ubuntu2:             {
+-    vm_url: "https://cloud.skytap.com/vms/7285846",
+-    username: "skytap",
+-    password: "CarpYe$$$"
+-  },
+-  ubuntu_with_vagrant: {vm_url: "https://cloud.skytap.com/vms/7397734"},
+-  us_east:             {vm_url: "https://cloud.skytap.com/vms/6232386"},
+-  emea:                {vm_url: "https://cloud.skytap.com/vms/4153172"},
+-  eng11490:            {vm_url: "https://cloud.skytap.com/templates/696065"},
+-  no_disk:             {vm_url: "https://cloud.skytap.com/vms/7500356"},
+-  public_template_no_sudoers: {
+-    vm_url: "https://cloud.skytap.com/vms/3157858",
+-  },
+-  windows_winrm_configured: {
+-    vm_url: "https://cloud.skytap.com/vms/7242468",
+-    username: "Administrator",
+-    password: "admin",
+-    communicator: :winrm,
+-  },
+-  vm_on_dev: {
+-    vm_url:"https://cloud.skytap.dev/vms/372"
+-  },
+-}.tap do |ret|
+-  ret.each do |key, vm|
+-    vm[:username] ||= "skytap"
+-    vm[:password] ||= "ChangeMe!"
+-    vm[:communicator] ||= :ssh
+-  end
+-end
+-
+-##################################
+-settings_key = :etrue_prod
+-vm1_key = :golden
+-vm2_key = :windows_winrm_configured
+-vm3_key = :ubuntu2
+-#############################
+-
++$script = <<SCRIPT
++  sudo apt-get update
++  sudo apt-get install -y apache2 lynx-cur
++  #sudo update-rc.d apache2 enable
++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  = settings[settings_key][:username]
+-    skytap.api_token = settings[settings_key][:api_token]
+-    skytap.base_url  = settings[settings_key][:base_url]
+-    skytap.vpn_url   = settings[settings_key][:vpn_url]
++    skytap.username  = "foo"
++    skytap.api_token = "bar"
++    skytap.vpn_url   = "/vpns/vpn-711360"
+   end
+ 
+   config.vm.define "vm1" do |box|
+-    #box.vm.hostname = "vm1"
+     box.vm.provider :skytap do |box|
+-      box.vm_url = vms[vm1_key][:vm_url]
+-      #box.cpus = 1
++      box.vm_url = "/vms/6869434"
+     end
+-    box.ssh.username    = vms[vm1_key][:username]
+-    box.ssh.password    = vms[vm1_key][:password]
+-    box.vm.communicator = vms[vm1_key][:communicator]
+-    box.vm.synced_folder "vm1", "/synced", type: :nfs
+-    #box.vm.provision "shell", path: "provisioning/trivial.sh"
+-    box.vm.provision "shell", path: "provisioning/vagrant.sh"
+-
+-    #box.vm.network :forwarded_port, guest: 80, host: 9000
+-    #box.vm.network :forwarded_port, guest: 21, host: 9001
++    box.ssh.username    = "skytap"
++    box.ssh.password    = "ChangeMe!"
++    box.vm.provision "shell", inline: $script
++    box.vm.network :forwarded_port, guest: 80, host: 8080
+   end
+-
+-#  config.vm.define "vm2" do |box|
+-#    box.vm.hostname = "vm2"
+-#    box.vm.provider :skytap do |box|
+-#      box.vm_url = vms[vm2_key][:vm_url]
+-#    end
+-#    box.ssh.username    = vms[vm2_key][:username]
+-#    box.ssh.password    = vms[vm2_key][:password]
+-#    box.vm.communicator = vms[vm2_key][:communicator]
+-#    box.vm.synced_folder "vm2", "/synced", type: :nfs
+-#  end
+-#
+-#  config.vm.define "vm3" do |box|
+-#    box.vm.hostname = "vm3"
+-#    box.vm.provider :skytap do |box|
+-#      box.vm_url = vms[vm3_key][:vm_url]
+-#    end
+-#    box.ssh.username    = vms[vm3_key][:username]
+-#    box.ssh.password    = vms[vm3_key][:password]
+-#    box.vm.communicator = vms[vm3_key][:communicator]
+-#    box.vm.synced_folder "vm3", "/synced", type: :nfs
+-#    box.vm.provision "shell", path: "provisioning/trivial.sh"
+-#  end
+ end
+-
+-#ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']
+-