From 44f4e49e12ac48bd2297588555744cd86c885712 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Mon, 28 Jan 2019 13:30:45 +0100
Subject: [PATCH] Add ubuntu to both libvirt and virtualbox and fix ordering.

---
 Vagrantfile                  |  2 +-
 Vagrantfile.libvirt          | 16 ++++++++++++----
 Vagrantfile.virtualbox       | 14 +++++++++++---
 inventory/group_vars/all.yml |  2 +-
 playbook.yml                 |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3f83971..0333340 120000
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1 +1 @@
-Vagrantfile.virtualbox
\ No newline at end of file
+Vagrantfile.libvirt
\ No newline at end of file
diff --git a/Vagrantfile.libvirt b/Vagrantfile.libvirt
index b739609..489eaf4 100644
--- a/Vagrantfile.libvirt
+++ b/Vagrantfile.libvirt
@@ -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
diff --git a/Vagrantfile.virtualbox b/Vagrantfile.virtualbox
index 27dba9e..91662ac 100644
--- a/Vagrantfile.virtualbox
+++ b/Vagrantfile.virtualbox
@@ -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
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 8a9c78e..9c594d0 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -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"
diff --git a/playbook.yml b/playbook.yml
index 3874c59..f4aab36 100755
--- a/playbook.yml
+++ b/playbook.yml
@@ -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