Add ubuntu to both libvirt and virtualbox and fix ordering.

This commit is contained in:
Robert de Bock 2019-01-28 13:30:45 +01:00
parent 7e20027316
commit 44f4e49e12
5 changed files with 26 additions and 10 deletions

2
Vagrantfile vendored
View File

@ -1 +1 @@
Vagrantfile.virtualbox
Vagrantfile.libvirt

View File

@ -1,8 +1,16 @@
Vagrant.configure("2") do |config|
config.vm.define "fedora29" do |fedora28|
fedora28.vm.box = "fedora/29-cloud-base"
fedora28.vm.synced_folder '.', '/vagrant', disabled: true
fedora28.vm.provider :libvirt do |domain|
config.vm.define "fedora" do |fedora|
fedora.vm.box = "fedora/29-cloud-base"
fedora.vm.synced_folder '.', '/vagrant', disabled: true
fedora.vm.provider :libvirt do |domain|
domain.memory = 4096
domain.cpus = 4
end
end
config.vm.define "ubuntu" do |ubuntu|
ubuntu.vm.box = "generic/ubuntu1804"
ubuntu.vm.synced_folder '.', '/vagrant', disabled: true
ubuntu.vm.provider :libvirt do |domain|
domain.memory = 4096
domain.cpus = 4
end

View File

@ -1,7 +1,15 @@
Vagrant.configure("2") do |config|
config.vm.define "fedora29" do |fedora28|
fedora28.vm.box = "fedora/29-cloud-base"
fedora28.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.define "fedora" do |fedora|
fedora.vm.box = "fedora/29-cloud-base"
fedora.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.provider "virtualbox" do |v|
v.memory = 4096
v.cpus = 2
end
end
config.vm.define "ubuntu" do |ubuntu|
ubuntu.vm.box = "ubuntu/trusty64"
ubuntu.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.provider "virtualbox" do |v|
v.memory = 4096
v.cpus = 2

View File

@ -10,7 +10,7 @@ users_user_list:
- name: robertdb
comment: Robert de Bock
group: robertdb
groups: wheel,docker
groups: docker
cron_allow: yes
sudo_options: "ALL=(ALL) NOPASSWD: ALL"
authorized_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWswOogkZz/ihQA0lENCwDwSzmtmBWtFwzIzDlfa+eb4rBt6rZBg7enKeMqYtStI/NDneBwZUFBDIMu5zJTbvg7A60/WDhWXZmU21tZnm8K7KREFYOUndc6h//QHig6IIaIwwBZHF1NgXLtZ0qrUUlNU5JSEhDJsObMlPHtE4vFP8twPnfc7hxAnYma5+knU6qTMCDvhBE5tGJdor4UGeAhu+SwSVDloYtt1vGTmnFn8M/OD/fRMksusPefxyshJ37jpB4jY/Z9vzaNHwcj33prwl1b/xRfxr/+KRJsyq+ZKs9u2TVw9g4p+XLdfDtzZ8thR2P3x3MFrZOdFmCbo/5"

View File

@ -12,6 +12,7 @@
- robertdebock.firewall
- robertdebock.digitalocean_agent
- robertdebock.common
- robertdebock.python_pip
- robertdebock.docker
- robertdebock.users
- robertdebock.postfix
@ -20,7 +21,6 @@
- robertdebock.ansible
- robertdebock.ansible_lint
- robertdebock.buildtools
- robertdebock.python_pip
- robertdebock.molecule
- robertdebock.ara
- robertdebock.ruby