Commit Graph

8911 Commits

Author SHA1 Message Date
Seth Vargo 01e4a34c9b Merge pull request #7151 from mitchellh/sethvargo/stderr_and_out
Check both stderr and stdout
2016-03-17 10:58:57 -04:00
Seth Vargo d565c2f07e Check both stderr and stdout
Different vbox versions print this to different streams, so check both
just to be sure
2016-03-17 10:52:10 -04:00
Seth Vargo 32c4638ffd Update CHANGELOG 2016-03-17 10:49:16 -04:00
Seth Vargo 5b336949b5 Merge pull request #7050 from md55/snapshots-in-virtualbox41
Adds snapshot commands in VirtualBox 4.1
2016-03-17 10:48:03 -04:00
John Julien e0ecda961c Fixed linked clone failure when master VM is missing
If the master VM is removed, but the master_id file exists, Vagrant
would still attempt to clone using the master_id rather then
importing re-importing first.

Fixes #6742
2016-03-09 19:33:47 -06:00
Jack Pearkes 1f88a97373 Merge pull request #7123 from mitchellh/vagrant-and-atlas
website: add a page to send folks to get to a signup link for atlas
2016-03-08 11:05:21 -08:00
Jack Pearkes 295e396292 website: catch more atlas.hashicorp.com and fix enterprise spelling 2016-03-08 10:57:35 -08:00
Seth Vargo bd1df1332b Update CHANGELOG 2016-03-08 13:56:58 -05:00
Seth Vargo 991fec65f6 Merge pull request #7120 from larsch/restart-network-arch
Restart network after reconfiguration
2016-03-08 13:55:50 -05:00
Jack Pearkes 16ef95e829 website: add a page to send folks to get to a signup link for atlas 2016-03-08 10:53:51 -08:00
Seth Vargo 013b76e92f Merge pull request #7122 from kenorb/patch-1
Fixes #7121: Corrected binary logic description.
2016-03-08 13:53:06 -05:00
Rafal 1b35ba99f6 Corrected binary logic description.
As per http://stackoverflow.com/q/28651275/55075 thread, this seems to be confusing.

> CRLFs are changed to LFs if this is set to true.
2016-03-08 15:52:20 +00:00
Lars Christensen a6565199ff Restart network after reconfiguration
Fixes #7119.
2016-03-08 16:24:24 +01:00
Seth Vargo c6c9942e2e Merge pull request #7104 from altexdim/fix_centos_networks
Fixed centos 7 networks if using more than 3 ethernet adapters.
2016-03-07 11:30:26 -05:00
Altex 9e9909536c fix 2016-03-07 19:25:57 +03:00
Seth Vargo be1421f116 Update CHANGELOG 2016-03-07 11:01:20 -05:00
Seth Vargo 77a090395a Merge pull request #7101 from mwrock/generation
only specify Hyper-V generation if the parameter is supported
2016-03-07 10:57:21 -05:00
Seth Vargo e69d2665ba Merge pull request #7107 from jtopper/docs_for_6879
Update website docs for #6879
2016-03-07 10:53:08 -05:00
Jon Topper ee8361dea1 Update website docs for #6879 2016-03-06 16:14:14 +00:00
Altex e998d6b0f4 Fixed centos 7 networks if using more than 3 ethernet adapters. 2016-03-05 22:25:59 +03:00
Gilles Cornu 47c0833277 ansible_local: use double quotes instead of single quotes
Before this minor change, the '--limit' and '--start-at-task'
ansible-playbook command line arguments were enclosed into single
quotes. Using double quotes adds a bit more flexibility, especially
about the task name referred by `start_at_task` option.

It also aligns with the handling of the '--extra-vars' parameter
(see cb80286).
2016-03-05 17:25:54 +01:00
Gilles Cornu cb80286a4a ansible_local: put json extra-vars in double quotes
Without this change, the JSON string generated from the `extra_vars`
Ruby hash is passed without enclosing quotes and is then not parseable
by the ansible-playbook command when exectuted in a usual shell context.

In this changeset, the ansible (remote) unit test coverage is improved
to cover both usage of `extra_vars` (ansible_local unit tests are still
missing).

Additional Notes:

 - Double quotes are favored to single quotes in order to allow usage of
   any character for the variable values. For this reason additional
   escaping is appended to JSON-inner double quotes and backslashes.

 - This problem was not affecting the `ansible` remote provisioner
   (which is running the ansible-playbook command via the childprocess
   Ruby library). But with this change, the `verbose` output will also
   now be correct for a copy-paste reuse.

 - After this change, all the "--extra-vars" arguments (also a var
   file passed with the @-syntax or anything coming via the
   `raw_arguments` option) are "blindly" and systematically enclosed
   in double quoted and double-escaped.
   This is not optimal and can potentially break with peculiar values
   (e.g. a double quote character (") cannot be used in a json value
   when using `raw_arguments`). That said, I think that the current
   solution is a reasonable trade-off, since the official `extra_vars`
   option should now be able to cover a great majority of use cases.

Fix #6726
2016-03-05 17:24:28 +01:00
Matt Wrock 508492faae fixes #7098 only specifying Hyper-V generation if the parameter is supported 2016-03-04 23:42:17 -08:00
Paul Hinze ffe0ef71ad Update CHANGELOG.md 2016-03-04 11:42:13 -06:00
Paul Hinze 32519b226c Merge pull request #6879 from jtopper/allow_no_delete_snapshot_on_pop
Add missing features to snapshot restore/pop
2016-03-04 11:40:54 -06:00
Jon Topper a7008ef5ec Fix up style nit. 2016-03-04 17:35:54 +00:00
Seth Vargo e0361e83cc Update docs 2016-03-04 11:45:20 -05:00
Seth Vargo 9623457513 Update CHANGELOG 2016-03-02 07:41:12 -07:00
Seth Vargo a746e21d28 Merge pull request #7093 from amontalban/fix-freebsd-network-config
[MOD] Change the way FreeBSD network interfaces are configured. Fixes…
2016-03-02 07:40:24 -07:00
Andres Montalban 492ba40fd1 [MOD] Change the way FreeBSD network interfaces are configured. Fixes #5852 2016-03-01 19:28:09 -03:00
Marchenko Alexandr 51d7c98d49 hyperv differencing disk 2016-03-01 17:23:38 +02:00
Seth Vargo ebcc73f338 Update CHANGELOG 2016-02-29 07:20:47 -05:00
Seth Vargo fbd765acc1 Do not interpolate in SMB linux heredoc
Fixes GH-6906
2016-02-29 07:19:45 -05:00
Seth Vargo 7574937c3f Update business address 2016-02-29 07:18:27 -05:00
Seth Vargo 0aa3db0fe5 Merge pull request #7086 from kamigerami/fixes-7074-does-not-allow-provisioning-when-container-name-is-specified
#7074 - fixes does not allow provisioning when container name is specified
2016-02-29 07:15:01 -05:00
Kamjar Gerami fc6bc723f7 #7074 - fixes does not allow provisioning when container name is specifed - since recent versions of Docker stores it's full container ID we no longer need to use the short version 2016-02-28 13:00:35 +01:00
Seth Vargo c851637260 Update CHANGELOG 2016-02-27 12:42:08 -05:00
Seth Vargo 809b99b773 Merge pull request #7085 from kamigerami/fixes-7084-notrunc-command-is-wrong-in-client.rb
#7084 - fixes-7084-notrunc-command-is-wrong-in-client.rb : corrected …
2016-02-27 12:41:01 -05:00
Kamjar Gerami 6754f8db14 #7084 - fixes-7084-notrunc-command-is-wrong-in-client.rb : corrected the -notrunc command to --no-trunc 2016-02-27 02:16:46 +01:00
Seth Vargo 00dbcbdc3e Merge pull request #7081 from geo4orce/master
Typo: "complEments" for making it complEte.
2016-02-26 12:17:46 -05:00
Geo c06e06f756 Typo: "complEments" for making it complEte.
If something complEments something, it completes it. ComplIment means
praise or free.
2016-02-26 12:08:40 -05:00
Seth Vargo c441de57f3 Merge pull request #7078 from donaldguy/chefdk_detection_fix
Correctly detect chefdk install
2016-02-25 20:34:54 -05:00
Donald Guy 52c95ce291 Correctly detect chefdk install 2016-02-25 19:42:58 -05:00
Mark Peek 563ce33738 Do not ignore the sentinal file when running resume
The sentinal file was always being ignored when running the
resume command. This is fixed along with allowing provision
options to be used with resume. Fixes #6787
2016-02-19 18:24:48 -08:00
Seth Vargo 29506f8a3e Merge pull request #7056 from radarhere/patch-1
Fixed typos
2016-02-19 12:08:23 -05:00
Andrew Murray 98a18bbaf5 Fixed typos 2016-02-20 00:00:26 +11:00
Evgeniy N 890820eaf6 Add snapshot commands
Fixed error remains in other versions:
  return [] if e.extra_data[:stdout].include?("does not have")
should be
  return [] if e.extra_data[:stderr].include?("does not have")

Many methods are the same in different version_X, and should be moved to Base class.
2016-02-18 11:47:07 +06:00
Seth Vargo c880d1dbbb Move to .github 2016-02-17 15:18:58 -05:00
Seth Vargo a5dcc531d1 Add Vagrantfile to issue 2016-02-17 13:27:28 -05:00
Seth Vargo 0e46617bec Add PR and issues template 2016-02-17 13:24:49 -05:00