Commit Graph

56 Commits

Author SHA1 Message Date
Brian Cain a9564b2137 (#8933) Align file provisioner functionality on all platforms
This commit aligns how the file provisioner should work on all host
machines. It ensures that a `/.` is only applied if the user intended
to upload a folder to a destination under a different name. It ensures
that if uploading to a windows guest with a different destination folder
name, it does not nest the source folder under that name so that it
works the same as it does on linux platforms. It also updates the
behavior of the winrm upload communicator by allowing an array of paths
to be uploaded instead of a single file or folder to allow for this new
functionality for windows guests.
2017-08-31 15:57:53 -07:00
Brian Cain 432cb8d915 (#7826) Add salt_arg option for passing flags to salt tool
This commit introduces the salt_arg option that allows a user to pass
additional command line flags to the `salt` tool when provisioning with
a master setup.

It also adds additional config validation to ensure that both
`salt_args` and `salt_call_args` is an array.
2017-08-29 14:11:06 -07:00
Brian Cain 9a29d7be6b (#7836) Introduce salt_call_args option for salt provisioner
This config option for the salt provisioner allows you to pass
additional arguments to the salt-call executable.
2017-08-29 11:17:29 -07:00
Gilles Cornu c3f0b1c1b2 Ansible Docs: Fix headers and indentation
Align the headers style and wording in the intro page.

[ci skip]
2017-08-22 19:18:32 +02:00
Gilles Cornu e436f53fe9 Ansible Docs: Fix a typo in Markdown indentation
[ci skip]
2017-08-22 07:54:00 +02:00
Brian Cain 623b117208 Merge pull request #8682 from Telekom-PD/omnibus-url
Add config option omnibus_url for chef provisioners
2017-08-03 09:19:13 -07:00
Artem Sidorenko 875c2edc62 Add config option omnibus_url for chef provisioners
This option is useful for internal setups, where own customized
omnibus installation script is used (e.g. to get chef from a mirror)
2017-08-03 10:06:27 +02:00
Brian Cain a05d95bd0a (#7139) Add post-install provisioner to docker provisioner
Prior to this commit, if a user attempted to configure
`/etc/default/docker` through vagrant prior to installation, the package
manager would not override an existing configuration and installing
docker would then fail. This commit fixes this by introducing a
`post_install_provisioner` that allows users to define a provisioner
block that will run after docker has been installed, allowing users to
configure `/etc/default/docker` how they want.
2017-06-27 16:01:23 -07:00
Dafydd Jones 71216cf4f9 update latest salt minion version for windows 2017-04-13 12:36:45 -07:00
Gilles Cornu 80d105cf8c
ansible_local: Add the :pip_args_only install mode
With the introduction of `pip_args` option, you can easily extend the
`:pip` installation mode behaviour. But some interesting/advanced usages
are still not possible because of the auto-generated parts ("ansible"
package, version selection, and the `--upgrade` flag).

By adding this "pip_args_only" install mode, it will be for instance
possible to:
- install unofficial releases, like release candidates published at
  https://releases.ansible.com/
- install more pip packages (e.g. via a `requirements.txt` file), with
  hash validation, etc.

Note that there is no config validation that requires `pip_args` option
to be defined when the :pip_args_only mode is selected. This would be
more elegant, and user friendly to raise a configuration error, but this
can wait. At least, running with an empty `pip_args` won't lead to any
command crash, since the rather dummy "pip install" shows an helper
notice and terminates with a zero (0) exit code.

This change is thought as a complement to the changes originally
proposed in pull request GH-8170.
2017-03-24 17:35:34 +01:00
Gilles Cornu b40d347944
ansible_local: Polish the new `pip_args` option
Ref GH-8170
2017-03-24 00:01:17 +01:00
James Carr 7e2e5654ed
ansible_local: Add `pip_args` option
With this new option, it is now possible to pass additional arguments to
pip command when the `install_mode` is "pip".

(@gildegoma reworded the original commit message of pull request GH-8170)
2017-03-24 00:01:14 +01:00
Florian Breisch 84f49bf0ce Add hint for .verbose-attribute 2017-02-20 16:40:24 +01:00
Chris Roberts 9cd636c4d9 Merge pull request #8100 from chrisroberts/docs/vagrant-salt
Add note about vagrant-salt plugin
2017-02-01 12:44:34 -08:00
Alvaro Miranda Aguilera 560ed2bfee add note that puppet need to be installed 2017-01-15 07:38:43 +01:00
Chris Roberts 734b196d05 Merge pull request #8146 from ctranstrum/patch-1
Fix typo.
2017-01-05 10:42:12 -08:00
Gilles Cornu 9493901e0c
provisioners/ansible: Add example of `host_vars` values that include quotes
Motivated by the support effort on GH-8158 ;-)
2016-12-28 23:23:43 +01:00
ctranstrum 52f45f27c4 Fix typo.
Looks like there was a typo. Fixed.
2016-12-21 15:08:57 -07:00
Chris Roberts 6b2db8cf2a Add note about vagrant-salt plugin 2016-12-08 13:33:03 -08:00
Gilles Cornu 8caed8ea16 Merge pull request #7918 from mitchellh/gildegoma/fix-7195
Add `config_file` option to both Ansible provisioners
2016-11-15 08:29:30 +01:00
Chris Roberts da45ca707c Add md5 and sha1 checksum support to Downloader.
Allows checksum validation on downloaded files via Util::Downloader
using MD5 and/or SHA1 checksums. This also integrates checksum validation
support with the shell provisioner for downloaded remote files.
2016-11-09 16:05:39 -08:00
Chris Roberts 05963159a8 Merge pull request #7931 from chrisroberts/puppet/env-vars
Puppet environment variables
2016-10-28 12:46:44 -07:00
Chris Roberts 4595082a23 Include hash data types within puppet apply documentation 2016-10-27 15:15:03 -07:00
Chris Roberts 36d0722366 Merge pull request #7719 from dragon788/patch-1
Corrected typo, added a couple examples.
2016-10-26 10:25:04 -07:00
Azul a4408037ba add support for environment variables on a puppet apply run 2016-10-26 09:36:34 -07:00
Chris Roberts 3ee2bca793 Merge pull request #7907 from chrisroberts/salt-config/defaults
provisioners/salt: Synchronize config defaults with documentation
2016-10-24 07:07:41 -07:00
Gilles Cornu a842abbc38
provisioners/ansible(both): Add config_file option
With this new option defined, the `ansible-galaxy` and
`ansible-playbook` commands generated by the Ansible provisioners will
be executed with the ANSIBLE_CONFIG environment variable set
accordingly.

Resolve GH-7195

This commit also fix the following open issues:
- Implement the pending RSpec examples about path existence checks
  performed by the ansible (remote) provisioner.
- In verbose mode, the ansible remote provisioner now correctly displays
  the Ansible Galaxy parameters ("role_file" and "roles_path") with
  single quotes (which is safer for potential copy-paste usage).

Additional Notes:
- Test coverage for `ansible_local` provisioner is still not
  implemented. See GH-6633.
- Test coverage for galaxy from host is not implemented yet (due to
  general issue with mocking both command executions, see
  https://github.com/mitchellh/vagrant/pull/6529#r45278451
2016-10-22 01:09:12 +02:00
Gilles Cornu 9d95eb821c
provisioners/ansible: Minor documentation improvements
- Try to make more visible the options shared by both provisioners
- Update some internal links to directly reach the mentioned option

[ci skip]
2016-10-22 01:05:50 +02:00
Gilles Cornu 35f7c2c4c9
provisioners/ansible: Fix raw_arguments documentation
Precise valid and invalid syntax for `raw_arguments` array values,
especially for the `ansible` remote provisioner.

Close GH-7890

[ci skip]
2016-10-22 01:00:57 +02:00
Gilles Cornu 80fb6be61f
docs/ansible: Fix small issues
- fix alpha-order listing of the shared options ansible_common.html.md
- fix two wrong indentations in ansible_intro.html.md

[ci skip]
2016-10-17 21:14:50 +02:00
Chris Roberts fa2a9105f0 provisioners/salt: Synchronize config defaults with documentation 2016-10-17 10:11:39 -07:00
Daniel Gonzalez 79a3cb8a14 Add unit test and documentation for playbook_command option 2016-10-10 16:56:36 +02:00
dragon788 977630c7de Corrected typo, added a couple examples. 2016-08-15 16:45:35 -05:00
Gilles Cornu 06a12097b1 provisioners/ansible(both): fix docs indentation
Bullet Lists are no longer correclty grouped (after the introduction of
the new layout). This is kind of workaround to keep each sub-paragraphs
of a list item well aligned.
2016-06-08 23:53:58 +02:00
Gilles Cornu bb9dba56ac provisioners/ansible_local: add "pip" install_mode
These changes have been validated against the following guest systems:
- Debian 7 and 8
- Ubuntu 12.04, 14.04 and 16.04
- Fedora 21 and 23
- CentOS 7
- OracleLinux 7
- Scientific Linux 7

At the moment, the pip setup (via get-pip.py script) is not working for
RHEL6-like systems (CentOS 6.6, OracleLinux 6.5, Scientific Linux 6),
because Python 2.6 has been deprecated and is no longer supported by
Python core team. I consider this limitation with low priority in
Vagrant context.

The `:pip` install_mode is currently not implemented for the following
platforms:
- OpenSUSE
- ArchLinux
- FreeBSD

Known Issue: By using get-pip.py script, any previous pip installation
will be most probably overrided. This could be an issue for Python
developers who would prefer to keep their base box setup untouched. In
future iteration, it could be possible to choose to reinstall/upgrade
pip or not. issue for Python developers who would prefer to keep their
base box setup untouched. In future iteration, it could be possible to
choose to reinstall/upgrade pip or not.

Resolve GH-6654

Resolve GH-7167 as the `version` option is now considered to select the
version of Ansible to be installed.
2016-06-08 23:53:58 +02:00
Ján Dzurek 8985605e35 Ansible Local docs typo fix 2016-06-07 15:18:23 +02:00
Dan Falcone 219007c6e6 provisioners/ansible: Fix documentation typo 2016-06-01 20:01:10 -04:00
Seth Vargo 3fa30a71b0
provisioners/salt: Doc - fix typo 2016-06-01 08:31:31 -04:00
Seth Vargo 228abf27a6
provisioner/salt: fix orchestrations documentation
Fixes GH-7209
2016-05-31 22:06:57 -04:00
Seth Vargo 9b30557716 Merge pull request #7009 from daks/patch-1
puppet_apply doc: small typo fix
2016-05-29 01:22:15 -04:00
Seth Vargo 981b2a807d
Formatting 2016-05-29 00:55:04 -04:00
Seth Vargo 34777fb575 Merge pull request #7308 from davidsiefert/patch-1
Adding example of using the preserve_order flag
2016-05-29 00:54:09 -04:00
Dana Merrick f7fa88fe8b Fixing second paragraph indentation and link. 2016-05-26 11:32:21 -07:00
David Siefert 3706eef791 Adding example of using the preserve_order flag
I couldn't really understand how to use this feature.... I might be dumb, didn't rtfm, I dunno.  Here is a PR anyway to help clarify by example.
2016-05-11 16:58:01 -05:00
Gilles Cornu cdafc63a61 Docs: Fix statements about the ansible.cfg lookup
Related to GH-7195

[ci skip]
2016-04-24 20:27:23 +02:00
Gilles Cornu cf908d35e0 provisioners/ansible_local: Run galaxy from `provisioning_path` directory
Since it is now possible to specify some Galaxy settings in an
`ansible.cfg` file, it makes sense to run `ansible-galaxy` from the
same working directory as `ansible-playbook` execution does.

See http://docs.ansible.com/ansible/intro_configuration.html#galaxy-settings
2016-04-24 00:26:59 +02:00
Nicholas Byfleet cdb62d7977 Fixed typo: incorrect key name for environment_path option. 2016-04-18 16:16:57 +12: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
Gaurav Chaturvedi ccc9dbfbda Minor gramatical fix
Minor gramatical fix
2016-02-11 19:13:24 +05:30
Éric Veiras Galisson 2d1619e33b puppet_apply doc: small typo fix 2016-02-10 15:11:30 +01:00