hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2661 from xrousset78800/PHRAS-2136/force-ansible-on-vm

Browse Source 
PHRAS-2136 Force Vagrant on VM
This commit is contained in:
Nicolas Maillat
2018-07-06 00:25:07 +02:00
committed by GitHub
parent 65f103ae32 99f0c25f38
commit 01f8ba396f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Vagrantfile vendored
View File

@@ -87,7 +87,7 @@ Vagrant.configure("2") do |config|
# If ansible is in your path it will provision from your HOST machine # If ansible is in your path it will provision from your HOST machine
# If ansible is not found in the path it will be instaled in the VM and provisioned from there # If ansible is not found in the path it will be instaled in the VM and provisioned from there
if which('ansible-playbook') if which('ansible-playbook')
config.vm.provision "ansible" do |ansible| config.vm.provision "ansible_local" do |ansible|
ansible.playbook = "resources/ansible/playbook.yml" ansible.playbook = "resources/ansible/playbook.yml"
ansible.limit = 'all' ansible.limit = 'all'
ansible.verbose = 'vvv' ansible.verbose = 'vvv'
@@ -101,7 +101,7 @@ Vagrant.configure("2") do |config|
} }
end end
config.vm.provision "ansible", run: "always" do |ansible| config.vm.provision "ansible_local", run: "always" do |ansible|
ansible.playbook = "resources/ansible/playbook-always.yml" ansible.playbook = "resources/ansible/playbook-always.yml"
ansible.limit = 'all' ansible.limit = 'all'
ansible.verbose = 'v' ansible.verbose = 'v'