Commit Graph

8584 Commits

Author SHA1 Message Date
Gilles Cornu ab036ddd0b provisioners/ansible: don't format raw_arguments
With cb80286a4a, the helper function
stringify_ansible_playbook_command was also applied on the
`raw_arguments` content, which is not wanted. Given that users have used
the `raw_arguments` option as a workaround to avoid the bug GH-6726,
this new change ensure that any `--extra-vars` option passed as a raw
argument won't be additonally enquoted by the ansible_local
provisioner.

This change also improves the ansible remote provisioner verbose output,
but has no impact on its behaviour, which was already correct.

Note that this refactoring introduces some code duplications that are not
very elegant (see ansible_playbook_command_for_shell_execution in
host.rb and execute_ansible_playbook_from_host in base.rb). I hope we
can find a better implementation later, but it is good enough for now
since all these parts are covered by corresponding unit tests (the
`ansible_local` stuff being tested via the verbose output of the ansible
remote provisioner).
2016-04-20 23:50:42 +02: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
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
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
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
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
Seth Vargo ce5bcc14ec Merge pull request #7041 from interdev/7040-Preserve_Disk_Name
Fix for #7040 to Preserve disk name
2016-02-16 12:59:52 -05:00
Kevin Blair 026243c88b Typo
Changed message to match HyperV terminology
2016-02-16 14:58:42 +00:00
Kevin Blair 343a43cae6 Preserve Disk Image Name
detect and preserve the original name of the disk image rather than forcing it to be disk
2016-02-16 14:57:53 +00:00
Seth Vargo 43e90666e1 Merge pull request #7024 from budhrg/master
Fixed provisioner broken link
2016-02-12 11:28:50 -05:00
Seth Vargo 0f5b5eeb77 Merge pull request #7026 from jzohrab/fix_shared_folder_docs
Clarifying synced folders docs.
2016-02-12 11:28:04 -05:00
Jeff Zohrab 8d802f89ef Clarifying synced folders docs.
Addresses https://github.com/mitchellh/vagrant/issues/6945
2016-02-12 08:55:11 -05:00
Budhram Gurung fba4ddd9f6 Fixed provisioner broken link
Fixes https://github.com/mitchellh/vagrant/issues/7023
2016-02-12 17:52:44 +05:30
Seth Vargo b99ed21506 Merge pull request #7016 from oddtazz/patch-1
Minor gramatical fix
2016-02-11 08:07:49 -08:00
Gaurav Chaturvedi ccc9dbfbda Minor gramatical fix
Minor gramatical fix
2016-02-11 19:13:24 +05:30
Seth Vargo ca728df02b Update CHANGELOG 2016-02-08 10:55:44 -05:00
Seth Vargo 7287b69413 Merge pull request #7001 from mitchellh/sethvargo/def_chan
Use "stable" as the default Chef channel
2016-02-08 10:53:23 -05:00
Seth Vargo 8c68c6ec70 Use "stable" as the default Chef channel
Previously the default channel was "current", but after discussion with
@coderanger on GH-6979, it seems like this was a poor design decision.
Instead, we should use the stable channel and allow users to opt-in to
prerelease versions.

Fixes GH-6979
2016-02-08 10:49:48 -05:00
Seth Vargo 3c34b67ba1 Fix CHANGELOG typo 2016-02-07 13:07:15 -05:00
Seth Vargo d5f2799649 Grammar 2016-02-07 12:59:17 -05:00
Seth Vargo ea6e21a550 Merge pull request #6991 from jzohrab/debugging_docs
Add debugging log docs.
2016-02-07 12:57:56 -05:00
Jeff Zohrab 32a600283a Add debugging log docs. 2016-02-05 23:00:27 -05:00
Seth Vargo cb83a3d9df Merge pull request #6981 from krutcha/patch-1
Update boxes.html.md
2016-02-05 10:06:04 -05:00
Seth Vargo c65c6216fa Merge pull request #6983 from rightsaidjames/docs-cli-destroy-typo-fix
Changed "`destroy command`" to "`destroy` command"
2016-02-05 10:04:39 -05:00
James Thomas 52fa68f9f5 Changed "`destroy command`" to "`destroy` command"
The word "command" was enclosed in a code block despite not being part of the actual command you would run at the CLI.
2016-02-05 12:02:06 +00:00
krutcha a67bbcf95d Update boxes.html.md
On my system, generic complained when running VBoxLinuxAdditions.run.  It was solved by using the specific headers that matched my kernel.
2016-02-04 17:44:24 -08:00
Seth Vargo 082e65291e Update CHANGELOG 2016-02-04 12:11:41 -05:00
Seth Vargo ad28bcb448 Merge pull request #6977 from erSitzt/fix/master/tinycore_nfs_mount
Fix/master/tinycore nfs mount
2016-02-04 12:09:35 -05:00
Dennis dd541b93b9 ooops missed something while branching 2016-02-04 17:22:28 +01:00