Add ubuntu to both libvirt and virtualbox and fix ordering.
This commit is contained in:
parent
7e20027316
commit
44f4e49e12
|
|
@ -1 +1 @@
|
||||||
Vagrantfile.virtualbox
|
Vagrantfile.libvirt
|
||||||
|
|
@ -1,8 +1,16 @@
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.define "fedora29" do |fedora28|
|
config.vm.define "fedora" do |fedora|
|
||||||
fedora28.vm.box = "fedora/29-cloud-base"
|
fedora.vm.box = "fedora/29-cloud-base"
|
||||||
fedora28.vm.synced_folder '.', '/vagrant', disabled: true
|
fedora.vm.synced_folder '.', '/vagrant', disabled: true
|
||||||
fedora28.vm.provider :libvirt do |domain|
|
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.memory = 4096
|
||||||
domain.cpus = 4
|
domain.cpus = 4
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,15 @@
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.define "fedora29" do |fedora28|
|
config.vm.define "fedora" do |fedora|
|
||||||
fedora28.vm.box = "fedora/29-cloud-base"
|
fedora.vm.box = "fedora/29-cloud-base"
|
||||||
fedora28.vm.synced_folder '.', '/vagrant', disabled: true
|
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|
|
config.vm.provider "virtualbox" do |v|
|
||||||
v.memory = 4096
|
v.memory = 4096
|
||||||
v.cpus = 2
|
v.cpus = 2
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ users_user_list:
|
||||||
- name: robertdb
|
- name: robertdb
|
||||||
comment: Robert de Bock
|
comment: Robert de Bock
|
||||||
group: robertdb
|
group: robertdb
|
||||||
groups: wheel,docker
|
groups: docker
|
||||||
cron_allow: yes
|
cron_allow: yes
|
||||||
sudo_options: "ALL=(ALL) NOPASSWD: ALL"
|
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"
|
authorized_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWswOogkZz/ihQA0lENCwDwSzmtmBWtFwzIzDlfa+eb4rBt6rZBg7enKeMqYtStI/NDneBwZUFBDIMu5zJTbvg7A60/WDhWXZmU21tZnm8K7KREFYOUndc6h//QHig6IIaIwwBZHF1NgXLtZ0qrUUlNU5JSEhDJsObMlPHtE4vFP8twPnfc7hxAnYma5+knU6qTMCDvhBE5tGJdor4UGeAhu+SwSVDloYtt1vGTmnFn8M/OD/fRMksusPefxyshJ37jpB4jY/Z9vzaNHwcj33prwl1b/xRfxr/+KRJsyq+ZKs9u2TVw9g4p+XLdfDtzZ8thR2P3x3MFrZOdFmCbo/5"
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
- robertdebock.firewall
|
- robertdebock.firewall
|
||||||
- robertdebock.digitalocean_agent
|
- robertdebock.digitalocean_agent
|
||||||
- robertdebock.common
|
- robertdebock.common
|
||||||
|
- robertdebock.python_pip
|
||||||
- robertdebock.docker
|
- robertdebock.docker
|
||||||
- robertdebock.users
|
- robertdebock.users
|
||||||
- robertdebock.postfix
|
- robertdebock.postfix
|
||||||
|
|
@ -20,7 +21,6 @@
|
||||||
- robertdebock.ansible
|
- robertdebock.ansible
|
||||||
- robertdebock.ansible_lint
|
- robertdebock.ansible_lint
|
||||||
- robertdebock.buildtools
|
- robertdebock.buildtools
|
||||||
- robertdebock.python_pip
|
|
||||||
- robertdebock.molecule
|
- robertdebock.molecule
|
||||||
- robertdebock.ara
|
- robertdebock.ara
|
||||||
- robertdebock.ruby
|
- robertdebock.ruby
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue