DCD-224: Refactor some names and add postgresql from extras.

aws_jira_dc_node.yml

@@ -6,6 +6,6 @@
     product_user: jira
 
   roles:
-    - aws_linux2_base
+    - aws_linux2_common
-    - aws_linux2_java
+    - aws_linux2_product_common
     - product_base

group_vars/all.yml

@@ -1,3 +1,4 @@
 ---
+java_version: "1.8.0"
 postgres_version: "9.6"
 git_version: "2.14.4"

roles/aws_linux2_base/tasks/main.yml

@@ -1,18 +0,0 @@
----
-
-
-- name: Install AWS support packages
-  yum:
-    name:
-      - amazon-ssm-agent
-      - amazon-efs-utils
-
-- name: Install common util packages
-  yum:
-    name:
-      - jq
-      - git-{{git_version}}
-
-- name: Install Postgresql
-  # Amazon Linux 2 supplies extra packages via a special command.
-  command: amazon-linux-extras install -y "postgresql{{ postgres_version }}"

roles/aws_linux2_common/tasks/main.yml

@@ -0,0 +1,13 @@
+---
+
+
+- name: Install AWS support packages
+  yum:
+    name:
+      - amazon-ssm-agent
+      - amazon-efs-utils
+
+- name: Install common util packages
+  yum:
+    name:
+      - jq

roles/aws_linux2_java/defaults/main.yml

@@ -1,2 +0,0 @@
----
-java_version: "1.8.0"

roles/aws_linux2_java/tasks/main.yml

@@ -1,6 +0,0 @@
----
-
-- name: Install Java SDK
-  yum:
-    name:
-      - java-{{java_version}}-openjdk-devel

roles/aws_linux2_product_common/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+
+# Amazon Linux 2 supplies extra packages via a special command.
+- name: Enable Postgresql from 'extras'
+  command: amazon-linux-extras enable -y "postgresql{{ postgres_version }}"
+
+- name: Install Java and other base packages
+  yum:
+    name:
+      - java-{{java_version}}-openjdk-devel
+      - git-{{git_version}}
+      - postgresql