diff --git a/test/Vagrantfile b/test/Vagrantfile index be09b19..05646a3 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -4,9 +4,6 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # config.vm.box = "debian/jessie64" - config.vm.box = "debian/stretch64" - config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true config.vm.provider :virtualbox do |v| @@ -16,12 +13,32 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| v.customize ["modifyvm", :id, "--ioapic", "on"] end - # Master - config.vm.define :default do |default| - default.vm.hostname = "default" + # Stretch + config.vm.define :stretch do |node| + node.vm.hostname = "stretch" + node.vm.box = "debian/stretch64" # default.vm.network :private_network, ip: "192.168.33.33" - default.vm.provision :ansible, run: "always" do |ansible| - ansible.limit = "default" + node.vm.provision :ansible, run: "always" do |ansible| + ansible.limit = "stretch" + ansible.playbook = "vagrant.yml" + # ansible.tags = "mysql" + ansible.raw_arguments = [ + "-b", + "--ask-vault-pass", + "--diff", + # "--syntax", + # "-vvv", + ] + end + end + + # Jessie + config.vm.define :jessie do |node| + node.vm.hostname = "jessie" + node.vm.box = "debian/jessie64" + # default.vm.network :private_network, ip: "192.168.33.33" + node.vm.provision :ansible, run: "always" do |ansible| + ansible.limit = "jessie" ansible.playbook = "vagrant.yml" # ansible.tags = "mysql" ansible.raw_arguments = [ diff --git a/test/vagrant.yml b/test/vagrant.yml index f563a81..e67d81b 100644 --- a/test/vagrant.yml +++ b/test/vagrant.yml @@ -1,10 +1,10 @@ --- -- hosts: default +- hosts: all gather_facts: yes become: yes vars_files: - - '~/code/evolix/evolix-private/vars/evolinux-secrets.yml' + - '~/GIT/evolix-private/vars/evolinux-secrets.yml' vars: evolinux_apt_upgrade: False @@ -25,4 +25,4 @@ roles: - evolinux-base - packweb-apache - - ~/code/evolix/evolix-private/roles/generateldif + - ~/GIT/evolix-private/roles/generateldif