From 8be5245cc0c2ad794f3f96a285deffa6890564e9 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Mon, 1 Apr 2019 12:40:20 +1100
Subject: [PATCH] DCD-224: Refactor some names and add postgresql from extras.

---
 aws_jira_dc_node.yml                           |  4 ++--
 group_vars/all.yml                             |  1 +
 roles/aws_linux2_base/tasks/main.yml           | 18 ------------------
 roles/aws_linux2_common/tasks/main.yml         | 13 +++++++++++++
 roles/aws_linux2_java/defaults/main.yml        |  2 --
 roles/aws_linux2_java/tasks/main.yml           |  6 ------
 roles/aws_linux2_product_common/tasks/main.yml | 12 ++++++++++++
 7 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 roles/aws_linux2_base/tasks/main.yml
 create mode 100644 roles/aws_linux2_common/tasks/main.yml
 delete mode 100644 roles/aws_linux2_java/defaults/main.yml
 delete mode 100644 roles/aws_linux2_java/tasks/main.yml
 create mode 100644 roles/aws_linux2_product_common/tasks/main.yml

diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index a21af59..5ca9c76 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -6,6 +6,6 @@
     product_user: jira
 
   roles:
-    - aws_linux2_base
-    - aws_linux2_java
+    - aws_linux2_common
+    - aws_linux2_product_common
     - product_base
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 548ee6d..9e57c0d 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,3 +1,4 @@
 ---
+java_version: "1.8.0"
 postgres_version: "9.6"
 git_version: "2.14.4"
diff --git a/roles/aws_linux2_base/tasks/main.yml b/roles/aws_linux2_base/tasks/main.yml
deleted file mode 100644
index 43bedad..0000000
--- a/roles/aws_linux2_base/tasks/main.yml
+++ /dev/null
@@ -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 }}"
diff --git a/roles/aws_linux2_common/tasks/main.yml b/roles/aws_linux2_common/tasks/main.yml
new file mode 100644
index 0000000..d56e010
--- /dev/null
+++ b/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
diff --git a/roles/aws_linux2_java/defaults/main.yml b/roles/aws_linux2_java/defaults/main.yml
deleted file mode 100644
index 3e032f8..0000000
--- a/roles/aws_linux2_java/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-java_version: "1.8.0"
diff --git a/roles/aws_linux2_java/tasks/main.yml b/roles/aws_linux2_java/tasks/main.yml
deleted file mode 100644
index 6ece738..0000000
--- a/roles/aws_linux2_java/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-- name: Install Java SDK
-  yum:
-    name:
-      - java-{{java_version}}-openjdk-devel
diff --git a/roles/aws_linux2_product_common/tasks/main.yml b/roles/aws_linux2_product_common/tasks/main.yml
new file mode 100644
index 0000000..cd18dc4
--- /dev/null
+++ b/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