diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 5af9b2d..553215a 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -3,7 +3,6 @@ Vagrant.configure(2) do |config| config.vm.define "wheezy64" do |wheezy64| wheezy64.vm.box = "debian/wheezy64" - wheezy64.vm.network :private_network, :ip => "10.1.1.11" wheezy64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -11,7 +10,6 @@ Vagrant.configure(2) do |config| end config.vm.define "jessie64" do |jessie64| jessie64.vm.box = "debian/jessie64" - jessie64.vm.network :private_network, :ip => "10.1.1.12" jessie64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -19,7 +17,6 @@ Vagrant.configure(2) do |config| end config.vm.define "wily64" do |wily64| wily64.vm.box = "ubuntu/wily64" - wily64.vm.network :private_network, :ip => "10.1.1.13" wily64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -27,7 +24,6 @@ Vagrant.configure(2) do |config| end config.vm.define "precise64" do |precise64| precise64.vm.box = "ubuntu/precise64" - precise64.vm.network :private_network, :ip => "10.1.1.14" precise64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -35,7 +31,6 @@ Vagrant.configure(2) do |config| end config.vm.define "trusty64" do |trusty64| trusty64.vm.box = "ubuntu/trusty64" - trusty64.vm.network :private_network, :ip => "10.1.1.15" trusty64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -43,7 +38,6 @@ Vagrant.configure(2) do |config| end config.vm.define "xenial64" do |xenial64| xenial64.vm.box = "ubuntu/xenial64" - xenial64.vm.network :private_network, :ip => "10.1.1.18" xenial64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -51,7 +45,6 @@ Vagrant.configure(2) do |config| end config.vm.define "vivid64" do |vivid64| vivid64.vm.box = "ubuntu/vivid64" - vivid64.vm.network :private_network, :ip => "10.1.1.16" vivid64.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" @@ -60,7 +53,6 @@ Vagrant.configure(2) do |config| config.vm.define "centos" do |centos| centos.vm.box = "centos/7-cloud" centos.vm.box_url = "https://github.com/CommanderK5/packer-centos-template/releases/download/0.7.1/vagrant-centos-7.1.box" - centos.vm.network :private_network, :ip => "10.1.1.17" centos.vm.provision "ansible" do |ansible| ansible.sudo = true ansible.playbook = "site.yml" diff --git a/vagrant/ansible.cfg b/vagrant/ansible.cfg index ac09f6c..69ee117 100644 --- a/vagrant/ansible.cfg +++ b/vagrant/ansible.cfg @@ -1,2 +1,3 @@ [defaults] +inventory = .vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory roles_path = ../../ diff --git a/vagrant/inventory b/vagrant/inventory deleted file mode 100644 index c4edfd8..0000000 --- a/vagrant/inventory +++ /dev/null @@ -1,8 +0,0 @@ -wheezy64 ansible_ssh_host=10.1.1.11 -jessie64 ansible_ssh_host=10.1.1.12 -wily64 ansible_ssh_host=10.1.1.13 -precise64 ansible_ssh_host=10.1.1.14 -trusty64 ansible_ssh_host=10.1.1.15 -vivid64 ansible_ssh_host=10.1.1.16 -centos ansible_ssh_host=10.1.1.17 -xenial64 ansible_ssh_host=10.1.1.18 diff --git a/vagrant/site.yml b/vagrant/site.yml index b8266de..7f7adf4 100644 --- a/vagrant/site.yml +++ b/vagrant/site.yml @@ -7,7 +7,7 @@ logentries_logs: [ { name: "Auth", - path: "/var/log/auth.log" + path: "{{ '/var/log/secure' if ansible_os_family == 'RedHat' else '/var/log/auth.log' }}" } ] }