From 1bf354298051ef84900cc38bb24f3681af34edba Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Wed, 12 Jun 2019 07:34:22 +0200
Subject: [PATCH] Use different way to call roles.

See https://github.com/ansible/galaxy/issues/1902 for details.
---
 README.md                      |  4 +++-
 Vagrantfile.libvirt            |  2 +-
 Vagrantfile.virtualbox         | 21 ++++++++----------
 galaxy.yml                     |  2 +-
 inventory/host_vars/fedora.yml |  2 ++
 playbook.yml                   | 40 +++++++++++++++++-----------------
 roles/ara/tasks/main.yml       |  2 +-
 7 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 inventory/host_vars/fedora.yml

diff --git a/README.md b/README.md
index 55c96a5..d34966a 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,9 @@ mazer install robertdebock.ansible_development_environment
 
 ## Requirements
 
-- One machine, about 4GB or RAM will do.
+- One machine
+- About 4GB or RAM will do.
+- 2 CPUs, 1 will also do.
 - Personalized `inventory/group_vars/all.yml`.
 
 ## Mac / Linux
diff --git a/Vagrantfile.libvirt b/Vagrantfile.libvirt
index 34cc022..1b49e7b 100644
--- a/Vagrantfile.libvirt
+++ b/Vagrantfile.libvirt
@@ -1,6 +1,6 @@
 Vagrant.configure("2") do |config|
   config.vm.define "fedora" do |fedora|
-    fedora.vm.box = "fedora/29-cloud-base"
+    fedora.vm.box = "fedora/30-cloud-base"
     fedora.vm.synced_folder '.', '/vagrant', disabled: true
     fedora.vm.provider :libvirt do |domain|
       domain.memory = 4096
diff --git a/Vagrantfile.virtualbox b/Vagrantfile.virtualbox
index 91662ac..3eb3e7d 100644
--- a/Vagrantfile.virtualbox
+++ b/Vagrantfile.virtualbox
@@ -1,21 +1,18 @@
 Vagrant.configure("2") do |config|
   config.vm.define "fedora" do |fedora|
-    fedora.vm.box = "fedora/29-cloud-base"
+    fedora.vm.box = "fedora/30-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
-    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
+#    end
+#  end
 end
-
-
-
diff --git a/galaxy.yml b/galaxy.yml
index ebad932..026ec57 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 namespace: "robertdebock"
 name: "development_environment"
 description: Install everything you need to develop Ansible roles.
-version: "1.0.4"
+version: "1.1.0"
 readme: "README.md"
 authors:
     - "Robert de Bock"
diff --git a/inventory/host_vars/fedora.yml b/inventory/host_vars/fedora.yml
new file mode 100644
index 0000000..a78c254
--- /dev/null
+++ b/inventory/host_vars/fedora.yml
@@ -0,0 +1,2 @@
+---
+ansible_pyhton_interpreter: /usr/bin/python3
diff --git a/playbook.yml b/playbook.yml
index 4a6e093..f32e840 100755
--- a/playbook.yml
+++ b/playbook.yml
@@ -6,23 +6,23 @@
   gather_facts: no
 
   roles:
-    - bootstrap
-    - update
-    - fail2ban
-    - common
-    - buildtools
-    - epel
-    - python_pip
-    - docker
-    - users
-    - postfix
-    - vagrant
-    - investigate
-    - ansible
-    - ansible_lint
-    - molecule
-    - ara
-    - ruby
-    - travis
-    - git
-    - atom
+    - robertdebock.development_environment.bootstrap
+    - robertdebock.development_environment.update
+    - robertdebock.development_environment.fail2ban
+    - robertdebock.development_environment.common
+    - robertdebock.development_environment.buildtools
+    - robertdebock.development_environment.epel
+    - robertdebock.development_environment.python_pip
+    - robertdebock.development_environment.docker
+    - robertdebock.development_environment.users
+    - robertdebock.development_environment.postfix
+    - robertdebock.development_environment.vagrant
+    - robertdebock.development_environment.investigate
+    - robertdebock.development_environment.ansible
+    - robertdebock.development_environment.ansible_lint
+    - robertdebock.development_environment.molecule
+    - robertdebock.development_environment.ara
+    - robertdebock.development_environment.ruby
+    - robertdebock.development_environment.travis
+    - robertdebock.development_environment.git
+    - robertdebock.development_environment.atom
diff --git a/roles/ara/tasks/main.yml b/roles/ara/tasks/main.yml
index 926f248..a1aa7c0 100644
--- a/roles/ara/tasks/main.yml
+++ b/roles/ara/tasks/main.yml
@@ -18,7 +18,7 @@
 
 - name: create ara service
   import_role:
-    name: robertdebock.service
+    name: robertdebock.development_environment.service
 
 - name: find callback_plugins path
   block: