StubbornJava
diff --git a/‎ansible/roles/apps/app_base/tasks/main.yml renamed to ‎ansible/roles/apps/jvm_app_base/tasks/main.yml
Lines changed: 7 additions & 1 deletion b/‎ansible/roles/apps/app_base/tasks/main.yml renamed to ‎ansible/roles/apps/jvm_app_base/tasks/main.yml
Lines changed: 7 additions & 1 deletion
diff --git a/‎ansible/roles/apps/app_base/templates/secure.conf.j2 renamed to ‎ansible/roles/apps/jvm_app_base/templates/secure.conf.j2 b/‎ansible/roles/apps/app_base/templates/secure.conf.j2 renamed to ‎ansible/roles/apps/jvm_app_base/templates/secure.conf.j2
diff --git a/‎ansible/roles/apps/app_base/templates/supervisorapp.conf.j2 renamed to ‎ansible/roles/apps/jvm_app_base/templates/supervisorapp.conf.j2 b/‎ansible/roles/apps/app_base/templates/supervisorapp.conf.j2 renamed to ‎ansible/roles/apps/jvm_app_base/templates/supervisorapp.conf.j2
diff --git a/‎ansible/roles/apps/app_base/vars/main.yml renamed to ‎ansible/roles/apps/jvm_app_base/vars/main.yml b/‎ansible/roles/apps/app_base/vars/main.yml renamed to ‎ansible/roles/apps/jvm_app_base/vars/main.yml
diff --git a/‎ansible/roles/java/tasks/main.yml
Lines changed: 0 additions & 3 deletions b/‎ansible/roles/java/tasks/main.yml
Lines changed: 0 additions & 3 deletions
diff --git a/‎ansible/roles/java/vars/main.yml
Lines changed: 0 additions & 3 deletions b/‎ansible/roles/java/vars/main.yml
Lines changed: 0 additions & 3 deletions
diff --git a/‎ansible/stubbornjava.yml
Lines changed: 6 additions & 8 deletions b/‎ansible/stubbornjava.yml
Lines changed: 6 additions & 8 deletions
@@ -1,4 +1,10 @@
 ---
+  - name: Install Java
+    include_role:
+      name: geerlingguy.java
+      java_packages:
+        - java-1.8.0-openjdk
+
   - name: Including Supervisord
     include_role:
       name: supervisord
@@ -21,7 +27,7 @@
       owner: "{{app_user}}"
       group: "{{app_user_group}}"
 
-  - name: Supervisor stubbornjava script
+  - name: "Copying supervisor {{app_name}}.conf"
     template:
       src: supervisorapp.conf.j2
       dest: "/etc/supervisor.d/{{app_name}}.conf"
 
@@ -3,11 +3,9 @@
 - hosts: stubbornjava
   become: true
   roles:
-    - { role: common, become: true }
-    - { role: java, become: true }
-    - {
-        role: apps/app_base,
-        app_name: stubbornjava,
-        app_command: "java8 -Denv={{env}} -server -Xmx640m -cp 'stubbornjava-all.jar' com.stubbornjava.webapp.StubbornJavaWebApp",
-        become: true
-      }
+    - role: common
+      become: true
+    - role: apps/jvm_app_base
+      app_name: stubbornjava
+      app_command: "java8 -Denv={{env}} -server -Xmx640m -cp 'stubbornjava-all.jar' com.stubbornjava.webapp.StubbornJavaWebApp"
+      become: true