This repository was archived by the owner on Feb 13, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -29,10 +29,10 @@ vconfig = load_config([
29
29
30
30
provisioner = vconfig [ 'force_ansible_local' ] ? :ansible_local : vagrant_provisioner
31
31
if provisioner == :ansible
32
- playbook = "#{ host_drupalvm_dir } /provisioning/playbook.yml "
32
+ provisioning_dir = "#{ host_drupalvm_dir } /provisioning"
33
33
config_dir = host_config_dir
34
34
else
35
- playbook = "#{ guest_drupalvm_dir } /provisioning/playbook.yml "
35
+ provisioning_dir = "#{ guest_drupalvm_dir } /provisioning"
36
36
config_dir = guest_config_dir
37
37
end
38
38
@@ -103,14 +103,17 @@ Vagrant.configure('2') do |config|
103
103
end
104
104
105
105
config . vm . provision provisioner do |ansible |
106
- ansible . playbook = playbook
106
+ ansible . playbook = " #{ provisioning_dir } / playbook.yml"
107
107
ansible . extra_vars = {
108
108
config_dir : config_dir ,
109
109
drupalvm_env : drupalvm_env
110
110
}
111
111
ansible . raw_arguments = Shellwords . shellsplit ( ENV [ 'DRUPALVM_ANSIBLE_ARGS' ] ) if ENV [ 'DRUPALVM_ANSIBLE_ARGS' ]
112
112
ansible . tags = ENV [ 'DRUPALVM_ANSIBLE_TAGS' ]
113
113
ansible . verbose = ENV [ 'DRUPALVM_DEBUG' ]
114
+ unless ENV [ 'ANSIBLE_CONFIG' ]
115
+ ansible . config_file = "#{ provisioning_dir } /ansible#{ '.debug' if ENV [ 'DRUPALVM_DEBUG' ] } .cfg"
116
+ end
114
117
# Use pip to get the latest Ansible version when using ansible_local.
115
118
provisioner == :ansible_local && ansible . install_mode = 'pip'
116
119
end
Original file line number Diff line number Diff line change 1
1
[defaults]
2
2
roles_path = ./roles
3
+ deprecation_warnings = False
3
4
4
5
[ssh_connection]
5
6
pipelining = True
Original file line number Diff line number Diff line change
1
+ [defaults]
2
+ roles_path = ./roles
3
+
4
+ [ssh_connection]
5
+ pipelining = True
You can’t perform that action at this time.
0 commit comments