Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ladar Levison 2019-08-27 20:32:31 +05:30
commit 7e4c4cd71a
2 changed files with 14 additions and 14 deletions

View File

@ -78,20 +78,20 @@ This section lists the _specific_ options for the Ansible Local provisioner. In
- `:pip`: Ansible is installed from [PyPI](https://pypi.python.org/pypi) with [pip](https://pip.pypa.io) package installer. With this mode, Vagrant will systematically try to [install the latest pip version](https://pip.pypa.io/en/stable/installing/#installing-with-get-pip-py). With the `:pip` mode you can optionally install a specific Ansible release by setting the [`version`](/docs/provisioning/ansible_common.html#version) option. - `:pip`: Ansible is installed from [PyPI](https://pypi.python.org/pypi) with [pip](https://pip.pypa.io) package installer. With this mode, Vagrant will systematically try to [install the latest pip version](https://pip.pypa.io/en/stable/installing/#installing-with-get-pip-py). With the `:pip` mode you can optionally install a specific Ansible release by setting the [`version`](/docs/provisioning/ansible_common.html#version) option.
Example: Example:
```ruby ```ruby
config.vm.provision "ansible_local" do |ansible| config.vm.provision "ansible_local" do |ansible|
ansible.playbook = "playbook.yml" ansible.playbook = "playbook.yml"
ansible.install_mode = "pip" ansible.install_mode = "pip"
ansible.version = "2.2.1.0" ansible.version = "2.2.1.0"
end end
``` ```
With this configuration, Vagrant will install `pip` and then execute the command With this configuration, Vagrant will install `pip` and then execute the command
```shell ```shell
sudo pip install --upgrade ansible==2.2.1.0 sudo pip install --upgrade ansible==2.2.1.0
``` ```
As-is `pip` is installed if needed via a default command which looks like As-is `pip` is installed if needed via a default command which looks like

View File

@ -41,6 +41,6 @@ responds to reports of malicious software distributed via Vagrant Cloud
and takes down boxes and takes down boxes
- __The latest release date__. More up-to-date boxes contain up-to-date - __The latest release date__. More up-to-date boxes contain up-to-date
software software
- __Availability of the box download__. Vagrant Cloud periodically checks if box - __Availability of the box download__. Vagrant Cloud periodically checks if a box
has is publicly accessible. You can see this information on the box is publicly accessible. You can see this information on the box
page next to the provider page next to the provider