From 58692b28431233c28f0e7255fa3a61874d9df220 Mon Sep 17 00:00:00 2001
From: Ben Partridge <bpartridge@atlassian.com>
Date: Fri, 3 Jan 2020 12:04:40 +1100
Subject: [PATCH] DCD-880: Variablify create_backups tasks

---
 roles/create_backups/defaults/main.yml             | 6 ++++++
 roles/create_backups/molecule/default/molecule.yml | 4 ----
 roles/create_backups/molecule/default/playbook.yml | 5 +++++
 roles/create_backups/tasks/amazon.yml              | 2 +-
 roles/create_backups/tasks/ubuntu.yml              | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 roles/create_backups/defaults/main.yml

diff --git a/roles/create_backups/defaults/main.yml b/roles/create_backups/defaults/main.yml
new file mode 100644
index 0000000..f687b28
--- /dev/null
+++ b/roles/create_backups/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+atl_slingshot_yum_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-rpm'
+
+atl_slingshot_deb_pubkey_url: 'https://packages.atlassian.com/api/gpg/key/public'
+atl_slingshot_deb_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-deb'
+atl_slingshot_deb_repo_components: 'stable main'
\ No newline at end of file
diff --git a/roles/create_backups/molecule/default/molecule.yml b/roles/create_backups/molecule/default/molecule.yml
index ecc65a7..c6a6d26 100644
--- a/roles/create_backups/molecule/default/molecule.yml
+++ b/roles/create_backups/molecule/default/molecule.yml
@@ -8,12 +8,8 @@ lint:
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: ubuntu_lts
     image: ubuntu:bionic
-    groups:
-      - aws_node_local
 provisioner:
   name: ansible
   lint:
diff --git a/roles/create_backups/molecule/default/playbook.yml b/roles/create_backups/molecule/default/playbook.yml
index c57f038..34a4c1b 100644
--- a/roles/create_backups/molecule/default/playbook.yml
+++ b/roles/create_backups/molecule/default/playbook.yml
@@ -2,5 +2,10 @@
 - name: Converge
   hosts: all
   tasks:
+    # Role default vars must be included because we aren't running the whole role, just a subset of tasks
+    - name: Include role vars
+      include_vars:
+        file: ../../defaults/main.yml
+
     - name: Install distro-specific backup support packages
       include_tasks: "../../tasks/{{ ansible_distribution|lower }}.yml"
diff --git a/roles/create_backups/tasks/amazon.yml b/roles/create_backups/tasks/amazon.yml
index d9a5e6d..e89b233 100644
--- a/roles/create_backups/tasks/amazon.yml
+++ b/roles/create_backups/tasks/amazon.yml
@@ -6,7 +6,7 @@
     file: atlassian-slingshot
     state: present
     description: Atlassian Slingshot
-    baseurl: https://packages.atlassian.com/atlassian-slingshot-rpm
+    baseurl: "{{ atl_slingshot_yum_repo_url }}"
     gpgcheck: no
 
 - name: Install atlassian-slingshot
diff --git a/roles/create_backups/tasks/ubuntu.yml b/roles/create_backups/tasks/ubuntu.yml
index 1b050e2..218c579 100644
--- a/roles/create_backups/tasks/ubuntu.yml
+++ b/roles/create_backups/tasks/ubuntu.yml
@@ -6,12 +6,12 @@
 
 - name: Add atlassian-slingshot debian repo public key
   apt_key:
-    url: https://packages.atlassian.com/api/gpg/key/public
+    url: "{{ atl_slingshot_deb_pubkey_url }}"
     state: present
 
 - name: Add atlassian-slingshot debian repository
   apt_repository:
-    repo: deb https://packages.atlassian.com/atlassian-slingshot-deb stable main
+    repo: "deb {{ atl_slingshot_deb_repo_url }} {{ atl_slingshot_deb_repo_components }}"
     state: present
     filename: atlassian-slingshot