testing
This commit is contained in:
parent
9b5be29a1a
commit
4a1509acb4
8
Vagrantfile
vendored
8
Vagrantfile
vendored
@ -16,13 +16,9 @@ SSH_FORWARD = settings['SSH_FORWARD'] || false
|
|||||||
|
|
||||||
# Default to shell environment variable: PLAYBOOK (priority #1)
|
# Default to shell environment variable: PLAYBOOK (priority #1)
|
||||||
PLAYBOOK=ENV["PLAYBOOK"]
|
PLAYBOOK=ENV["PLAYBOOK"]
|
||||||
if !PLAYBOOK
|
if !PLAYBOOK || PLAYBOOK.empty?
|
||||||
# PLAYBOOK setting in .vagrant.yml (priority #2)
|
# PLAYBOOK setting in .vagrant.yml (priority #2)
|
||||||
PLAYBOOK = settings['PLAYBOOK'] || false
|
PLAYBOOK = settings['PLAYBOOK'] || false
|
||||||
if !PLAYBOOK || PLAYBOOK.empty?
|
|
||||||
puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml"
|
|
||||||
abort
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
@ -46,6 +42,6 @@ Vagrant.configure("2") do |config|
|
|||||||
config.vm.provision "ansible" do |ansible|
|
config.vm.provision "ansible" do |ansible|
|
||||||
ENV['ANSIBLE_ROLES_PATH'] = File.dirname(__FILE__) + "/roles"
|
ENV['ANSIBLE_ROLES_PATH'] = File.dirname(__FILE__) + "/roles"
|
||||||
ansible.compatibility_mode = "2.0"
|
ansible.compatibility_mode = "2.0"
|
||||||
ansible.playbook = "dev/" + PLAYBOOK + ".yml"
|
ansible.playbook = "dev/" + PLAYBOOK || 'default' + ".yml"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
5
dev/default.yml
Normal file
5
dev/default.yml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
- name: Install 'default' aka nothing
|
||||||
|
hosts: all
|
||||||
|
become: true
|
||||||
|
roles:
|
||||||
|
- base
|
Loading…
x
Reference in New Issue
Block a user