diff --git a/.gitignore b/.gitignore
index b17231e..86b0332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 id_rsa
 roles/*
 files/ssh_keys
+.vagrant
diff --git a/.vagrant/machines/fedora29/libvirt/action_provision b/.vagrant/machines/fedora29/libvirt/action_provision
new file mode 100644
index 0000000..c094ad3
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/action_provision
@@ -0,0 +1 @@
+1.5:49e82318-88e2-4fa3-9c6a-5c3a5a4183a2
\ No newline at end of file
diff --git a/.vagrant/machines/fedora29/libvirt/creator_uid b/.vagrant/machines/fedora29/libvirt/creator_uid
new file mode 100644
index 0000000..e37d32a
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/creator_uid
@@ -0,0 +1 @@
+1000
\ No newline at end of file
diff --git a/.vagrant/machines/fedora29/libvirt/id b/.vagrant/machines/fedora29/libvirt/id
new file mode 100644
index 0000000..a554278
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/id
@@ -0,0 +1 @@
+49e82318-88e2-4fa3-9c6a-5c3a5a4183a2
\ No newline at end of file
diff --git a/.vagrant/machines/fedora29/libvirt/index_uuid b/.vagrant/machines/fedora29/libvirt/index_uuid
new file mode 100644
index 0000000..7cab89e
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/index_uuid
@@ -0,0 +1 @@
+1d3ed013c0f54f5ea1aa9619bcfd4ea9
\ No newline at end of file
diff --git a/.vagrant/machines/fedora29/libvirt/private_key b/.vagrant/machines/fedora29/libvirt/private_key
new file mode 100644
index 0000000..d58e387
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/private_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA03Sj1kb4IY2/xqaosJ4lmtBGR1RQSSpTsz/QciPuRzA8usLJ
+p1/66/BO/DuZoGjoKFwS7T6yVNm5xNWiEYUlNgfW1U4U6jguo7DFjZ6Rg6w1vKfh
+M6N/0u7xBdk9jvTLTVfmzY0nJXR2YyuiOxwD3MR2EY/E9bwS5Ji8A66aqQFZwQTK
+6HpslwpCD6GlXOmf74m/D6oMFOD5ZV0QestimGRge9IIxa07Q5wa/2sLHErxqK6i
+PadDH+10OPZledBtTjqJ1SO+M+E1SSTH36sNZNRLdmSh9jPNnhONdjvYy/5UuwjD
+vN45j0geJ1xNBRff+We7PrluSuQecyICGIg4pwIDAQABAoIBADH43r9FBl7noOrR
+eAxFU53CmtlAk7i2yBEUg651z1oDjFaWshFcHXCk2gXCEAxYvoTLPa3To1FqIvzh
+f+ukC6c5Mww157tyi5Mjs4xEbR8xE4ICKraJbSvsTAmVzXZ7Y5BjtafeM+ImI9RL
++4r8k+0YgM6lq2ZnjA96CPTVzrchrJt8isjuS3F45Oiy19DNMJXGcLHJVlU3Lm69
+8A77Mf8ertXtVJohAgEK4hnmDrMA4GqghvPtu8Wh3GmC91pP0fCIICnYi4x3iKLq
+l94a5usxBcozkL5iqfhFm1mBDCDuSHpKoKrNY/fZU3oiTpgctzKPY0xtXqtkuh1d
+MSAgxAECgYEA6ir+mXLAsT84RHTujnwBzuL17an58mytR6+rBFgIJ/WiwzFtMvfj
+noL0De6mQNtATIelxemJBbfAY9RVmjLrJ3080NsH9ZmvaUIBaFHwmLJBUa01cVZO
+lBhfOzYJJus9kFoGq7VOro3DMe/qICbCrBT26lt4jMiFg9sOmDR9ycsCgYEA5yuP
+FM6zDEXD3l8ROskFadwQiZeBa6oYITcT6yD9ZQs1N+zWYVEiAb5T5l/5Ava8CwWD
+z0vXohyUK7WQYhDTnZy5vn+Er6j0F8GH9JEe3mHIHdTuNzQz5YG+k1LFHTeW05N4
+IKrEMQCBj9yjwACGqy1S1bebJM1rvGklKFkqoRUCgYAXnxytuACuIJV5el4yK1o3
+V3e9cL8Q8FuOdq8GsiaoeUPg8tR0JsNkUwtxeFh3BGb5EVnsnAFBfWa/60RzWJ2W
+DzEaVG36HXWvZYQk1NczYA/swE86zp0AnXDF1U6ZCXPdYud3XMPCIfTFzdDNS3up
+xjeeLnn7oaKuSWOwgOMLfwKBgFVh41EeH0ezJOsnVefOg69b1sfbK7QmeQ8blsHL
+x4vgneFwGqaLHvJh5/85B3Iuy7mOaebQ7m4z/A5A23k9GcwnLPvNgaaX0sBLfPm5
++BrPJujN0saVA24Lg+ZKNf/anly7JS17pUcsFq6aIekyyIrFDMlfLXBkZxyKAW1r
+sbEZAoGAb9jvdsjeAL4US0LkK82+y2UQ4hxPOIvsrUyO3F1ULvy2JYUojw/TBlzP
+wP7YN1PHAba7LnhGY6qWDUoTJrftpjQO2EXxtMWGU8M/YtMByicpb3ahKUM6mH9l
+HWQQgu/Di5IycZ5OUR8/Xp2BdC6Oh6OT2vte26wsFHC9yxg+hAQ=
+-----END RSA PRIVATE KEY-----
diff --git a/.vagrant/machines/fedora29/libvirt/synced_folders b/.vagrant/machines/fedora29/libvirt/synced_folders
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/synced_folders
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/.vagrant/machines/fedora29/libvirt/vagrant_cwd b/.vagrant/machines/fedora29/libvirt/vagrant_cwd
new file mode 100644
index 0000000..9b2b41f
--- /dev/null
+++ b/.vagrant/machines/fedora29/libvirt/vagrant_cwd
@@ -0,0 +1 @@
+/home/robertdb/Documents/github.com/robertdebock/ansible-development-environment
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..b739609
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,10 @@
+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|
+      domain.memory = 4096
+      domain.cpus = 4
+    end
+  end
+end
diff --git a/ansible.cfg b/ansible.cfg
index 47132a2..9aea1ef 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,6 +2,6 @@
 roles_path=roles
 retry_files_enabled=no
 inventory=inventory
-stdout_callback = yaml
+stdout_callback=yaml
 
-callback_whitelist = profile_roles
+callback_whitelist=profile_roles
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 7831856..8e5ec90 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -15,6 +15,7 @@ users_user_list:
     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"
     manage_ssh_key: yes
+    copy_private_key: yes
 
 firewall_services:
   - name: ssh
@@ -32,92 +33,181 @@ git_user_email: robert@meinit.nl
 git_repository_destination: /home/robertdb/Documents/github.com/robertdebock
 
 git_repositories:
-  - name: ssh://git@github.com/robertdebock/ansible-role-ansible.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-ansible_lint.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-apt_autostart.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-ara.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-artifactory.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-at.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-awx.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-backup.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-bootstrap.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-buildtools.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-ca.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-cargo.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-clamav.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-cloud9.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-cntlm.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-common.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-cve_2018_19788.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-dhcpd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-digitalocean-agent.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-dns.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-docker.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-dovecot.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-epel.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-fail2ban.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-firewall.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-git.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-glusterfs.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-go.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-gotop.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-haproxy.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-haveged.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-httpd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-investigate.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-irslackd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-java.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-jenkins.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-locale.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-lynis.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-mediawiki.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-memcached.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-mitogen.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-molecule.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-mssql.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-mysql.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-natrouter.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-nginx.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-npm.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-ntp.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-openssh.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-openvas.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-owncloud.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-packer.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-php.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-phpmyadmin.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-postfix.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-python-pip.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-reboot.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-redis.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-release.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-restore.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-revealmd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-roundcubemail.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-rsyslog.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-ruby.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-rundeck.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-scl.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-selinux.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-skeleton.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-snort.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-spamassassin.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-squid.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-sudo-pair.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-terraform.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-tftpd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-tomcat.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-travis.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-update.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-users.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-vagrant.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-xinetd.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix_agent.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix_proxy.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix_repository.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix_server.git
-  - name: ssh://git@github.com/robertdebock/ansible-role-zabbix_web.git
-  - name: ssh://git@github.com/robertdebock/ansible-tools.git
-  - name: ssh://git@github.com/robertdebock/drawings.git
-  - name: ssh://git@github.com/robertdebock/robertdebock.github.io.git
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ansible.git
+    dest: ansible-role-ansible
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ansible_lint.git
+    dest: ansible-role-ansible_lint
+  - repo: ssh://git@github.com/robertdebock/ansible-role-apt_autostart.git
+    dest: ansible-role-apt_autostart
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ara.git
+    dest: ansible-role-ara
+  - repo: ssh://git@github.com/robertdebock/ansible-role-artifactory.git
+    dest: ansible-role-artifactory
+  - repo: ssh://git@github.com/robertdebock/ansible-role-at.git
+    dest: ansible-role-at
+  - repo: ssh://git@github.com/robertdebock/ansible-role-awx.git
+    dest: ansible-role-awx
+  - repo: ssh://git@github.com/robertdebock/ansible-role-backup.git
+    dest: ansible-role-backup
+  - repo: ssh://git@github.com/robertdebock/ansible-role-bootstrap.git
+    dest: ansible-role-bootstrap
+  - repo: ssh://git@github.com/robertdebock/ansible-role-buildtools.git
+    dest: ansible-role-buildtools
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ca.git
+    dest: ansible-role-ca
+  - repo: ssh://git@github.com/robertdebock/ansible-role-cargo.git
+    dest: ansible-role-cargo
+  - repo: ssh://git@github.com/robertdebock/ansible-role-clamav.git
+    dest: ansible-role-clamav
+  - repo: ssh://git@github.com/robertdebock/ansible-role-cloud9.git
+    dest: ansible-role-cloud9
+  - repo: ssh://git@github.com/robertdebock/ansible-role-cntlm.git
+    dest: ansible-role-cntlm
+  - repo: ssh://git@github.com/robertdebock/ansible-role-common.git
+    dest: ansible-role-common
+  - repo: ssh://git@github.com/robertdebock/ansible-role-cve_2018_19788.git
+    dest: ansible-role-cve_2018_19788
+  - repo: ssh://git@github.com/robertdebock/ansible-role-dhcpd.git
+    dest: ansible-role-dhcpd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-digitalocean-agent.git
+    dest: ansible-role-digitalocean-agent
+  - repo: ssh://git@github.com/robertdebock/ansible-role-dns.git
+    dest: ansible-role-dns
+  - repo: ssh://git@github.com/robertdebock/ansible-role-docker.git
+    dest: ansible-role-docker
+  - repo: ssh://git@github.com/robertdebock/ansible-role-dovecot.git
+    dest: ansible-role-dovecot
+  - repo: ssh://git@github.com/robertdebock/ansible-role-epel.git
+    dest: ansible-role-epel
+  - repo: ssh://git@github.com/robertdebock/ansible-role-fail2ban.git
+    dest: ansible-role-fail2ban
+  - repo: ssh://git@github.com/robertdebock/ansible-role-firewall.git
+    dest: ansible-role-firewall
+  - repo: ssh://git@github.com/robertdebock/ansible-role-git.git
+    dest: ansible-role-git
+  - repo: ssh://git@github.com/robertdebock/ansible-role-glusterfs.git
+    dest: ansible-role-glusterfs
+  - repo: ssh://git@github.com/robertdebock/ansible-role-go.git
+    dest: ansible-role-go
+  - repo: ssh://git@github.com/robertdebock/ansible-role-gotop.git
+    dest: ansible-role-gotop
+  - repo: ssh://git@github.com/robertdebock/ansible-role-haproxy.git
+    dest: ansible-role-haproxy
+  - repo: ssh://git@github.com/robertdebock/ansible-role-haveged.git
+    dest: ansible-role-haveged
+  - repo: ssh://git@github.com/robertdebock/ansible-role-httpd.git
+    dest: ansible-role-httpd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-investigate.git
+    dest: ansible-role-investigate
+  - repo: ssh://git@github.com/robertdebock/ansible-role-irslackd.git
+    dest: ansible-role-irslackd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-java.git
+    dest: ansible-role-java
+  - repo: ssh://git@github.com/robertdebock/ansible-role-jenkins.git
+    dest: ansible-role-jenkins
+  - repo: ssh://git@github.com/robertdebock/ansible-role-locale.git
+    dest: ansible-role-locale
+  - repo: ssh://git@github.com/robertdebock/ansible-role-lynis.git
+    dest: ansible-role-lynis
+  - repo: ssh://git@github.com/robertdebock/ansible-role-mediawiki.git
+    dest: ansible-role-mediawiki
+  - repo: ssh://git@github.com/robertdebock/ansible-role-memcached.git
+    dest: ansible-role-memcached
+  - repo: ssh://git@github.com/robertdebock/ansible-role-mitogen.git
+    dest: ansible-role-mitogen
+  - repo: ssh://git@github.com/robertdebock/ansible-role-molecule.git
+    dest: ansible-role-molecule
+  - repo: ssh://git@github.com/robertdebock/ansible-role-mssql.git
+    dest: ansible-role-mssql
+  - repo: ssh://git@github.com/robertdebock/ansible-role-mysql.git
+    dest: ansible-role-mysql
+  - repo: ssh://git@github.com/robertdebock/ansible-role-natrouter.git
+    dest: ansible-role-natrouter
+  - repo: ssh://git@github.com/robertdebock/ansible-role-nginx.git
+    dest: ansible-role-nginx
+  - repo: ssh://git@github.com/robertdebock/ansible-role-npm.git
+    dest: ansible-role-npm
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ntp.git
+    dest: ansible-role-ntp
+  - repo: ssh://git@github.com/robertdebock/ansible-role-openssh.git
+    dest: ansible-role-openssh
+  - repo: ssh://git@github.com/robertdebock/ansible-role-openvas.git
+    dest: ansible-role-openvas
+  - repo: ssh://git@github.com/robertdebock/ansible-role-owncloud.git
+    dest: ansible-role-owncloud
+  - repo: ssh://git@github.com/robertdebock/ansible-role-packer.git
+    dest: ansible-role-packer
+  - repo: ssh://git@github.com/robertdebock/ansible-role-php.git
+    dest: ansible-role-php
+  - repo: ssh://git@github.com/robertdebock/ansible-role-phpmyadmin.git
+    dest: ansible-role-phpmyadmin
+  - repo: ssh://git@github.com/robertdebock/ansible-role-postfix.git
+    dest: ansible-role-postfix
+  - repo: ssh://git@github.com/robertdebock/ansible-role-python-pip.git
+    dest: ansible-role-python_pip
+  - repo: ssh://git@github.com/robertdebock/ansible-role-reboot.git
+    dest: ansible-role-reboot
+  - repo: ssh://git@github.com/robertdebock/ansible-role-redis.git
+    dest: ansible-role-redis
+  - repo: ssh://git@github.com/robertdebock/ansible-role-release.git
+    dest: ansible-role-release
+  - repo: ssh://git@github.com/robertdebock/ansible-role-restore.git
+    dest: ansible-role-restore
+  - repo: ssh://git@github.com/robertdebock/ansible-role-revealmd.git
+    dest: ansible-role-revealmd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-roundcubemail.git
+    dest: ansible-role-roundcubemail
+  - repo: ssh://git@github.com/robertdebock/ansible-role-rsyslog.git
+    dest: ansible-role-rsyslog
+  - repo: ssh://git@github.com/robertdebock/ansible-role-ruby.git
+    dest: ansible-role-ruby
+  - repo: ssh://git@github.com/robertdebock/ansible-role-rundeck.git
+    dest: ansible-role-rundeck
+  - repo: ssh://git@github.com/robertdebock/ansible-role-scl.git
+    dest: ansible-role-scl
+  - repo: ssh://git@github.com/robertdebock/ansible-role-selinux.git
+    dest: ansible-role-selinux
+  - repo: ssh://git@github.com/robertdebock/ansible-role-skeleton.git
+    dest: ansible-role-skeleton
+  - repo: ssh://git@github.com/robertdebock/ansible-role-snort.git
+    dest: ansible-role-snort
+  - repo: ssh://git@github.com/robertdebock/ansible-role-spamassassin.git
+    dest: ansible-role-spamassassin
+  - repo: ssh://git@github.com/robertdebock/ansible-role-squid.git
+    dest: ansible-role-squid
+  - repo: ssh://git@github.com/robertdebock/ansible-role-sudo-pair.git
+    dest: ansible-role-sudo_pair
+  - repo: ssh://git@github.com/robertdebock/ansible-role-terraform.git
+    dest: ansible-role-terraform
+  - repo: ssh://git@github.com/robertdebock/ansible-role-tftpd.git
+    dest: ansible-role-tftpd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-tomcat.git
+    dest: ansible-role-tomcat
+  - repo: ssh://git@github.com/robertdebock/ansible-role-travis.git
+    dest: ansible-role-travis
+  - repo: ssh://git@github.com/robertdebock/ansible-role-update.git
+    dest: ansible-role-update
+  - repo: ssh://git@github.com/robertdebock/ansible-role-users.git
+    dest: ansible-role-users
+  - repo: ssh://git@github.com/robertdebock/ansible-role-vagrant.git
+    dest: ansible-role-vagrant
+  - repo: ssh://git@github.com/robertdebock/ansible-role-xinetd.git
+    dest: ansible-role-xinetd
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix.git
+    dest: ansible-role-zabbix
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_agent.git
+    dest: ansible-role-zabbix_agent
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_proxy.git
+    dest: ansible-role-zabbix_proxy
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_repository.git
+    dest: ansible-role-zabbix_repository
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_server.git
+    dest: ansible-role-zabbix_server
+  - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_web.git
+    dest: ansible-role-zabbix_web
+  - repo: ssh://git@github.com/robertdebock/ansible-tools.git
+    dest: ansible-tools
+  - repo: ssh://git@github.com/robertdebock/drawings.git
+    dest: drawings
+  - repo: ssh://git@github.com/robertdebock/robertdebock.github.io.git
+    dest: robertdebock.github.io
diff --git a/inventory/hosts b/inventory/hosts
index d186e78..da91247 100644
--- a/inventory/hosts
+++ b/inventory/hosts
@@ -1 +1 @@
-fedora-s-2vcpu-2gb-ams3-01 ansible_host=142.93.228.212
+#fedora-s-1vcpu-2gb-fra1-01 ansible_host=167.99.141.134
diff --git a/inventory/vagant.py b/inventory/vagant.py
new file mode 100755
index 0000000..2b444a7
--- /dev/null
+++ b/inventory/vagant.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# Adapted from Mark Mandel's implementation
+# https://github.com/ansible/ansible/blob/devel/plugins/inventory/vagrant.py
+import argparse
+import json
+import paramiko
+import subprocess
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Vagrant inventory script")
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('--list', action='store_true')
+    group.add_argument('--host')
+    return parser.parse_args()
+
+
+def list_running_hosts():
+    cmd = "vagrant status --machine-readable"
+    status = subprocess.check_output(cmd.split()).rstrip()
+    hosts = []
+    for line in status.split('\n'):
+        (_, host, key, value) = line.split(',',3)
+        if key == 'state' and value == 'running':
+            hosts.append(host)
+    return hosts
+
+
+def get_host_details(host):
+    cmd = "vagrant ssh-config {}".format(host)
+    p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
+    config = paramiko.SSHConfig()
+    config.parse(p.stdout)
+    c = config.lookup(host)
+    return {'ansible_ssh_host': c['hostname'],
+            'ansible_ssh_port': c['port'],
+            'ansible_ssh_user': c['user'],
+            'ansible_ssh_private_key_file': c['identityfile'][0]}
+
+
+def main():
+    args = parse_args()
+    if args.list:
+        hosts = list_running_hosts()
+        json.dump({'vagrant': hosts}, sys.stdout)
+    else:
+        details = get_host_details(args.host)
+        json.dump(details, sys.stdout)
+
+if __name__ == '__main__':
+    main()
diff --git a/playbook.yml b/playbook.yml
index b397922..c007104 100755
--- a/playbook.yml
+++ b/playbook.yml
@@ -9,19 +9,20 @@
     - robertdebock.bootstrap
     - robertdebock.update
     - robertdebock.fail2ban
-    - robertdebock.openssh
     - robertdebock.firewall
     - robertdebock.digitalocean_agent
     - robertdebock.common
+    - robertdebock.docker
     - robertdebock.users
     - robertdebock.postfix
-    - robertdebock.docker
     - robertdebock.vagrant
     - robertdebock.investigate
     - robertdebock.ansible
     - robertdebock.ansible_lint
     - robertdebock.buildtools
+    - robertdebock.python_pip
     - robertdebock.molecule
     - robertdebock.ara
     - robertdebock.ruby
     - robertdebock.travis
+    - robertdebock.git