vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118/vagrantfile

@@ -0,0 +1,403 @@
+# HG changeset patch
+# Parent fb70a607243a0a5da881a0566cdbc635103709c9
+# Parent  1a384b1c91740ed09d3c8d202960532280caa3b7
+my Vagrantfile, provisioning scripts, etc.
+* * *
+[mq]: vf3
+* * *
+[mq]: vf1
+
+diff --git a/Vagrantfile b/Vagrantfile
+new file mode 100644
+--- /dev/null
++++ b/Vagrantfile
+@@ -0,0 +1,157 @@
++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
++#############################
++
++
++Vagrant.configure(2) do |config|
++  config.vm.box = "skytap/empty"
++  config.vm.synced_folder ".", "/vagrant-skytap",
++    type: "rsync",
++    disabled: true,
++    rsync__exclude: [".hg/", "autossh.log"]
++
++  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]
++  end
++
++  #config.vm.provider :virtualbox do |virtualbox, override|
++  #  override.vm.box = "hashicorp/precise64"
++  #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
++    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, mount_options: ['actimeo=1']
++    #box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
++    #box.vm.provision "shell", path: "provisioning/trivial.sh"
++    box.vm.provision "shell", path: "provisioning/apache.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
++  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']
++
+diff --git a/provisioning/ab.sh b/provisioning/ab.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/ab.sh
+@@ -0,0 +1,4 @@
++#!/bin/bash
++
++sudo apt-get update
++sudo apt-get install -y apache2-utils
+diff --git a/provisioning/apache.sh b/provisioning/apache.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/apache.sh
+@@ -0,0 +1,5 @@
++#!/bin/bash
++
++sudo apt-get update
++sudo apt-get install -y apache2 lynx-cur
++sudo update-rc.d apache2 enable
+diff --git a/provisioning/lynx.sh b/provisioning/lynx.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/lynx.sh
+@@ -0,0 +1,4 @@
++#!/bin/bash
++
++sudo apt-get update
++sudo apt-get install -y lynx-cur
+diff --git a/provisioning/mysql.sh b/provisioning/mysql.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/mysql.sh
+@@ -0,0 +1,4 @@
++#!/bin/bash
++
++sudo apt-get update
++sudo apt-get install -y rails mysql-client-core-5.6 ruby-dev zlib1g-dev libxml2-dev libxslt-dev
+diff --git a/provisioning/rails.sh b/provisioning/rails.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/rails.sh
+@@ -0,0 +1,12 @@
++#!/bin/bash
++
++sudo apt-get update
++sudo apt-get install -y rails \
++  ruby-dev zlib1g-dev libxml2-dev libxslt-dev libsqlite3-dev nodejs \
++  lynx upstart
++
++cd app
++bundle install
++rails s &
++
++#sudo initctl start rails_demo
+diff --git a/provisioning/trivial.sh b/provisioning/trivial.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/trivial.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++
++echo "****************************** TRIVIAL PROVISIONING SCRIPT ******************************"
+diff --git a/provisioning/vagrant.sh b/provisioning/vagrant.sh
+new file mode 100644
+--- /dev/null
++++ b/provisioning/vagrant.sh
+@@ -0,0 +1,4 @@
++#!/bin/bash
++VAGRANT_URL=https://releases.hashicorp.com/vagrant/1.8.0/vagrant_1.8.0_x86_64.deb
++FILE=`mktemp`; wget "$VAGRANT_URL" -qO $FILE && sudo dpkg -i $FILE; rm $FILE
++vagrant plugin install vagrant-skytap
+diff --git a/vm1/Vagrantfile b/vm1/Vagrantfile
+new file mode 100644
+--- /dev/null
++++ b/vm1/Vagrantfile
+@@ -0,0 +1,148 @@
++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
++#############################
++
++
++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]
++  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
++    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
++  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']
++
+diff --git a/vm1/this_is_vm1 b/vm1/this_is_vm1
+new file mode 100644
+diff --git a/vm2/this_is_vm2 b/vm2/this_is_vm2
+new file mode 100644
+diff --git a/vm3/this_is_vm3 b/vm3/this_is_vm3
+new file mode 100644
+diff --git a/vm4/this_is_vm4 b/vm4/this_is_vm4
+new file mode 100644

data/_patches-20160118/vagrantfile-for-acceptance-tests

@@ -0,0 +1,29 @@
+# HG changeset patch
+# Parent 2f020374151a91cbb7c4f8c785c7861a396e4f09
+Vagrantfile for acceptance tests ** DO NOT COMMIT **
+
+diff -r 2f020374151a spec/acceptance/skeletons/generic/Vagrantfile
+--- a/spec/acceptance/skeletons/generic/Vagrantfile	Fri Dec 11 16:28:21 2015 -0800
++++ b/spec/acceptance/skeletons/generic/Vagrantfile	Fri Dec 11 16:31:50 2015 -0800
+@@ -2,14 +2,17 @@
+   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.base_url = "https://cloud.skytap.com/"
++    skytap.username = "etrue"
++    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++    skytap.vpn_url = "https://cloud.skytap.com/vpns/vpn-711360"
+   end
+ 
+   config.vm.define "vm1" do |ubuntu|
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = "https://example.com/vms/1"
++      box.vm_url = "https://cloud.skytap.com/vms/6869434" # golden!
+     end
++    ubuntu.ssh.username = "skytap"
++    ubuntu.ssh.password = "ChangeMe!"
+   end
+ end

data/_patches-20160118/vagrantfile-for-nick

@@ -0,0 +1,95 @@
+# HG changeset patch
+# Parent 8722732470b5a0c961d7e764f64cd20410c240db
+diff -r 8722732470b5 -r 0d08bb7429a8 Vagrantfile
+--- a/Vagrantfile	Thu Dec 03 15:09:16 2015 -0800
++++ b/Vagrantfile	Thu Dec 03 16:36:51 2015 -0800
+@@ -5,82 +5,28 @@
+   config.vm.provider :skytap do |skytap, override|
+     skytap.username = "etrue"
+     skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+-    #skytap.base_url = "https://cloud.skytap.com/"
+     skytap.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
+-    #skytap.username = "vagrant_provider_admin"
+-    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
+-    #skytap.base_url = "https://test.skytap.com/"
+-    #skytap.username = "jsmith"
+-    #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
+-    #skytap.base_url = "https://cloud.skytap.dev/"
+   end
+-
+-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
+-  # for test user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
+-  # local user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
+-
+   UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
+-  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
+-  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
+-  FROM_US_EAST = "https://cloud.skytap.com/vms/6232386"
+-  FROM_EMEA = "https://cloud.skytap.com/vms/4153172"
+-  ENG11490 = "https://cloud.skytap.com/templates/696065"
+-  NO_DISK = "https://cloud.skytap.com/vms/7500356"
+-
+-  # may be gone by the time you see this
+-  ENVIRONMENT_VM = "https://cloud.skytap.com/vms/7457184"
+-  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
+-  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
+-
+-  # separate template
+-  # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
+-  WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
+ 
+   config.vm.define "vm1" do |ubuntu|
+     ubuntu.vm.hostname = "vm1"
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU1#GENERIC_UBUNTU
+-      #box.cpus = 1
+-      #box.cpuspersocket = 1
+-      #box.ram = 1024
+-      #box.guestos = "ubuntu"
+-      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++      box.vm_url = UBUNTU1
+     end
+     ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
+-    #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']
+-    ubuntu.vm.communicator = :ssh
+     ubuntu.ssh.username = "skytap"
+     ubuntu.ssh.password = "ChangeMe!"
+-
+-    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
+-    #ubuntu.vm.provision "shell", path: "provisioning/apache.sh"
+-    #ubuntu.vm.provision "rails",  type: "shell", path: "provisioning/rails.sh"
+   end
+ 
+-  config.vm.define "vm2" do |windows|
+-    windows.vm.provider :skytap do |box, override|
+-      box.vm_url = WINDOWS_WINRM_CONFIGURED
+-      override.vm.guest = "windows"
++  config.vm.define "vm2" do |ubuntu|
++    ubuntu.vm.hostname = "vm2"
++    ubuntu.vm.provider :skytap do |box|
++      box.vm_url = UBUNTU1
+     end
+-    windows.vm.communicator = :winrm
+-  end
+-  config.winrm.username = 'Administrator'
+-  config.winrm.password = 'admin'
+-
+-  config.vm.define "vm3" do |ubuntu|
+-    ubuntu.vm.hostname = "vm3"
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU2#GENERIC_UBUNTU
+-      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
+-    end
+-    ubuntu.vm.communicator = :ssh
+     ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "CarpYe$$$"
+-    ubuntu.vm.synced_folder "vm3", "/synced", type: :nfs
+-    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
+-    #ubuntu.vm.provision "shell", path: "provisioning/mysql.sh"
++    ubuntu.ssh.password = "ChangeMe!"
++    ubuntu.vm.synced_folder "vm2", "/synced", type: :nfs
+   end
+ end
+ 

data/_patches-20160118/vagrantfiles-to-forget-what-they-are-for

@@ -0,0 +1,134 @@
+# HG changeset patch
+# Parent eaf8cbed3d3664a798f0ec263f8220edfbf0ab02
+diff -r eaf8cbed3d36 -r b56b6e6df314 Vagrantfile.for.nick
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/Vagrantfile.for.nick	Thu Dec 03 19:33:55 2015 -0800
+@@ -0,0 +1,33 @@
++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 = "etrue"
++    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++    skytap.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++  end
++  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
++
++  config.vm.define "vm1" do |ubuntu|
++    ubuntu.vm.hostname = "vm1"
++    ubuntu.vm.provider :skytap do |box|
++      box.vm_url = UBUNTU1
++    end
++    ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
++    ubuntu.ssh.username = "skytap"
++    ubuntu.ssh.password = "ChangeMe!"
++  end
++
++  config.vm.define "vm2" do |ubuntu|
++    ubuntu.vm.hostname = "vm2"
++    ubuntu.vm.provider :skytap do |box|
++      box.vm_url = UBUNTU1
++    end
++    ubuntu.ssh.username = "skytap"
++    ubuntu.ssh.password = "ChangeMe!"
++    ubuntu.vm.synced_folder "vm2", "/synced", type: :nfs
++  end
++end
++
++
+diff -r eaf8cbed3d36 -r b56b6e6df314 Vagrantfile.keep
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/Vagrantfile.keep	Thu Dec 03 19:33:55 2015 -0800
+@@ -0,0 +1,91 @@
++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 = "etrue"
++    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++    #skytap.base_url = "https://cloud.skytap.com/"
++    skytap.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++    #skytap.username = "vagrant_provider_admin"
++    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
++    #skytap.base_url = "https://test.skytap.com/"
++    #skytap.username = "jsmith"
++    #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
++    #skytap.base_url = "https://cloud.skytap.dev/"
++  end
++
++  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
++  # for test user
++  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
++  # local user
++  #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
++
++  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
++  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
++  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
++  FROM_US_EAST = "https://cloud.skytap.com/vms/6232386"
++  FROM_EMEA = "https://cloud.skytap.com/vms/4153172"
++  ENG11490 = "https://cloud.skytap.com/templates/696065"
++  NO_DISK = "https://cloud.skytap.com/vms/7500356"
++
++  # may be gone by the time you see this
++  ENVIRONMENT_VM = "https://cloud.skytap.com/vms/7457184"
++  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
++  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
++
++  # separate template
++  # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
++  WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
++
++  config.vm.define "vm1" do |ubuntu|
++    ubuntu.vm.hostname = "vm1"
++    ubuntu.vm.provider :skytap do |box|
++      box.vm_url = UBUNTU1#GENERIC_UBUNTU
++      #box.cpus = 1
++      #box.cpuspersocket = 1
++      #box.ram = 1024
++      #box.guestos = "ubuntu"
++      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++    end
++
++    ubuntu.vm.network :forwarded_port, guest: 80, host: 8080
++
++    #ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
++    #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']
++    ubuntu.vm.communicator = :ssh
++    ubuntu.ssh.username = "skytap"
++    ubuntu.ssh.password = "ChangeMe!"
++
++
++    #ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
++    #ubuntu.vm.provision "shell", path: "provisioning/apache.sh"
++    #ubuntu.vm.provision "rails",  type: "shell", path: "provisioning/rails.sh"
++  end
++
++#  config.vm.define "vm2" do |windows|
++#    windows.vm.provider :skytap do |box, override|
++#      box.vm_url = WINDOWS_WINRM_CONFIGURED
++#      override.vm.guest = "windows"
++#    end
++#    windows.vm.communicator = :winrm
++#  end
++#  config.winrm.username = 'Administrator'
++#  config.winrm.password = 'admin'
++#
++#  config.vm.define "vm3" do |ubuntu|
++#    ubuntu.vm.hostname = "vm3"
++#    ubuntu.vm.provider :skytap do |box|
++#      box.vm_url = UBUNTU2#GENERIC_UBUNTU
++#      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++#    end
++#    ubuntu.vm.communicator = :ssh
++#    ubuntu.ssh.username = "skytap"
++#    ubuntu.ssh.password = "CarpYe$$$"
++#    ubuntu.vm.synced_folder "vm3", "/synced", type: :nfs
++#    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
++#    #ubuntu.vm.provision "shell", path: "provisioning/mysql.sh"
++#  end
++end
++
++