From 337fb615b0d7c542a465e67c8a85de27f1f2f4bb Mon Sep 17 00:00:00 2001 From: Laurent Lavaud Date: Tue, 28 Nov 2023 11:30:10 +0100 Subject: [PATCH] jammy64 only --- Vagrantfile | 78 +++-------------------------------------------- vagrant-inventory | 6 +--- 2 files changed, 5 insertions(+), 79 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 45c2b89c..2eeb91ef 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,46 +7,11 @@ Vagrant.configure('2') do |config| config.ssh.insert_key = false config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key' - # - # DISABLED - # - # config.vm.define 'ubuntu16.local' do |machine| - # - # machine.vm.box = "bento/ubuntu-16.04" - # machine.vm.network :private_network, ip: '192.168.88.10' - # machine.vm.hostname = 'ubuntu16.local' - # - # machine.vm.provision 'ansible' do |ansible| - # ansible.playbook = 'tests/playbook.yml' - # ansible.verbose = "vvv" - # ansible.become = true - # ansible.inventory_path = 'vagrant-inventory' - # ansible.host_key_checking = false - # end - # - # end + config.vm.define 'jammy64.local' do |machine| - config.vm.define 'jessie64.local' do |machine| - - machine.vm.box = "debian/jessie64" - machine.vm.network :private_network, ip: '192.168.88.20' - machine.vm.hostname = 'jessie64.local' - - machine.vm.provision 'ansible' do |ansible| - ansible.playbook = 'tests/playbook.yml' - ansible.verbose = "vvv" - ansible.become = true - ansible.inventory_path = 'vagrant-inventory' - ansible.host_key_checking = false - end - - end - - config.vm.define 'wheezy64.local' do |machine| - - machine.vm.box = "debian/wheezy64" - machine.vm.network :private_network, ip: '192.168.88.21' - machine.vm.hostname = 'wheezy64.local' + machine.vm.box = "ubuntu/jammy64" + machine.vm.network :private_network, ip: '192.168.88.22' + machine.vm.hostname = 'jammy64.local' machine.vm.provision 'ansible' do |ansible| ansible.playbook = 'tests/playbook.yml' @@ -58,39 +23,4 @@ Vagrant.configure('2') do |config| end - config.vm.define 'centos7.local' do |machine| - - machine.vm.box = "centos/7" - machine.vm.network :private_network, ip: '192.168.88.30' - machine.vm.hostname = 'centos7.local' - - machine.vm.provision 'ansible' do |ansible| - ansible.playbook = 'tests/playbook.yml' - ansible.verbose = "vvv" - ansible.become = true - ansible.inventory_path = 'vagrant-inventory' - ansible.host_key_checking = false - end - - end - -## -## Fedora is disabled, as the build fails -## -## config.vm.define 'fedora27.local' do |machine| -## -## machine.vm.box = "fedora/27-cloud-base" -## machine.vm.network :private_network, ip: '192.168.88.40' -## machine.vm.hostname = 'fedora27.local' -## -## machine.vm.provision 'ansible' do |ansible| -## ansible.playbook = 'tests/playbook.yml' -## ansible.verbose = "vvv" -## ansible.become = true -## ansible.inventory_path = 'vagrant-inventory' -## ansible.host_key_checking = false -## end -## -## end - end diff --git a/vagrant-inventory b/vagrant-inventory index fba7c662..db90952a 100644 --- a/vagrant-inventory +++ b/vagrant-inventory @@ -1,6 +1,2 @@ [anxs] -## DISABLED ## ubuntu16.local ansible_ssh_host=192.168.88.10 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key -jessie64.local ansible_ssh_host=192.168.88.20 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key -wheezy64.local ansible_ssh_host=192.168.88.21 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key -centos7.local ansible_ssh_host=192.168.88.31 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key -## DISABLED ## fedora27.local ansible_ssh_host=192.168.88.40 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key +jammy64.local ansible_ssh_host=192.168.88.22 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key