From 1f535da3e69499d06ba1e5c1551fac8b3ecd6a87 2018-05-27 19:36:24
From: Branko Majic <branko@majic.rs>
Date: 2018-05-27 19:36:24
Subject: [PATCH] MAR-129: Updated backup_client tests to use variables from group_vars.

---

diff --git a/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7363abc345c3a24fb049761b49a4b34c363ba600
--- /dev/null
+++ b/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml
@@ -0,0 +1,10 @@
+---
+
+backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-mandatory.asc') }}"
+backup_server: 10.31.127.10
+backup_server_host_ssh_public_keys:
+  - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
+backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}"
diff --git a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml
new file mode 100644
index 0000000000000000000000000000000000000000..54b07f8b68eb23d5f025a0f9a160b2317a941f67
--- /dev/null
+++ b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml
@@ -0,0 +1,17 @@
+---
+
+backup_additional_encryption_keys:
+  - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_1.asc') }}"
+  - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_2.asc') }}"
+  - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_3.asc') }}"
+backup_client_username: backupuser
+backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}"
+backup_server: 10.31.127.10
+backup_server_destination: "/duplicity/{{ inventory_hostname }}"
+backup_server_host_ssh_public_keys:
+  - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
+  - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
+backup_server_port: 3333
+backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}"
diff --git a/roles/backup_client/molecule/default/playbook.yml b/roles/backup_client/molecule/default/playbook.yml
index a766908b4a81366e014bb5fc8037323948517a4d..3d266035f2eb64f6c63afac31c16fc257c99a37d 100644
--- a/roles/backup_client/molecule/default/playbook.yml
+++ b/roles/backup_client/molecule/default/playbook.yml
@@ -1,39 +1,9 @@
 ---
 
-- hosts: parameters-mandatory
-  become: true
-  roles:
-    - role: backup_client
-      backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-mandatory.asc') }}"
-      backup_server: 10.31.127.10
-      backup_server_host_ssh_public_keys:
-        - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
-      backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}"
-
-- hosts: parameters-optional
+- hosts: parameters-mandatory,parameters-optional
   become: true
-
   roles:
-    - role: backup_client
-      backup_additional_encryption_keys:
-        - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_1.asc') }}"
-        - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_2.asc') }}"
-        - "{{ lookup('file', 'tests/data/gnupg/additional_encryption_key_3.asc') }}"
-      backup_client_username: backupuser
-      backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}"
-      backup_server: 10.31.127.10
-      backup_server_destination: "/duplicity/{{ inventory_hostname }}"
-      backup_server_host_ssh_public_keys:
-        - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
-      backup_server_port: 3333
-      backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}"
-
+    - backup_client
 
 # Deploy a dummy pre-backup script for testing purposes.
 - hosts: parameters-mandatory,parameters-optional