From 89eb8817d79fcc904ac967a7e1c5b31d15879e0b Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Tue, 9 Apr 2019 15:30:42 +1000
Subject: [PATCH] DCD-224: Generalise the AWS base package install role.

---
 aws_jira_dc_node.yml                   |  3 ++-
 roles/aws_common/tasks/amazon.yml      | 11 +++++++++++
 roles/aws_common/tasks/main.yml        |  4 ++++
 roles/aws_linux2_common/tasks/main.yml | 13 -------------
 4 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 roles/aws_common/tasks/amazon.yml
 create mode 100644 roles/aws_common/tasks/main.yml
 delete mode 100644 roles/aws_linux2_common/tasks/main.yml

diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index 60e7627..2269713 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -7,7 +7,8 @@
     atl_product_user: jira
 
   roles:
-    - aws_linux2_common
+    - linux_common
+    - aws_common
     - aws_linux2_product_common
     - product_base
     - aws_efs_config
diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
new file mode 100644
index 0000000..e125696
--- /dev/null
+++ b/roles/aws_common/tasks/amazon.yml
@@ -0,0 +1,11 @@
+---
+
+- name: Install AWS support packages
+  yum:
+    name:
+      - amazon-ssm-agent
+      - amazon-efs-utils
+
+# Amazon Linux 2 supplies extra packages via a special command.
+- name: Enable Postgresql from 'extras'
+  command: amazon-linux-extras enable -y "postgresql{{ postgres_version }}"
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
new file mode 100644
index 0000000..b6d8366
--- /dev/null
+++ b/roles/aws_common/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+
+- name: Install distro-specific prerequisites
+  include: "{{ ansible_distribution|lower }}.yml"
diff --git a/roles/aws_linux2_common/tasks/main.yml b/roles/aws_linux2_common/tasks/main.yml
deleted file mode 100644
index d56e010..0000000
--- a/roles/aws_linux2_common/tasks/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-
-- name: Install AWS support packages
-  yum:
-    name:
-      - amazon-ssm-agent
-      - amazon-efs-utils
-
-- name: Install common util packages
-  yum:
-    name:
-      - jq