From 84a71d898692bf1f0e2a092bff0b75ed0676ca4f 2018-05-27 19:40:04
From: Branko Majic <branko@majic.rs>
Date: 2018-05-27 19:40:04
Subject: [PATCH] MAR-129: Updated backup_server tests to use the group_vars directory.

---

diff --git a/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml
new file mode 100644
index 0000000000000000000000000000000000000000..db65d081fb60f46db24cc9b63436e3e2437e36a2
--- /dev/null
+++ b/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml
@@ -0,0 +1,7 @@
+---
+
+backup_host_ssh_private_keys:
+  dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}"
+  rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}"
+  ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}"
+  ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
diff --git a/roles/backup_server/molecule/default/group_vars/parameters-optional.yml b/roles/backup_server/molecule/default/group_vars/parameters-optional.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f18232e2eef721847f2efb5a12112d94f52d29a0
--- /dev/null
+++ b/roles/backup_server/molecule/default/group_vars/parameters-optional.yml
@@ -0,0 +1,15 @@
+---
+
+backup_host_ssh_private_keys:
+  dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}"
+  rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}"
+  ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}"
+  ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
+backup_clients:
+  - server: client1.backup
+    ip: 10.31.127.1
+    public_key: "{{ lookup('file', 'tests/data/ssh/client1.pub') }}"
+  - server: client2-backup
+    uid: 5001
+    ip: 10.31.127.3
+    public_key: "{{ lookup('file', 'tests/data/ssh/client2.pub') }}"
diff --git a/roles/backup_server/molecule/default/playbook.yml b/roles/backup_server/molecule/default/playbook.yml
index 2b93b891457566de5cc2aee21c211cf9b6235bec..1ed9e0ca8f68e8755adaf280f89e1adcf0cbc7d9 100644
--- a/roles/backup_server/molecule/default/playbook.yml
+++ b/roles/backup_server/molecule/default/playbook.yml
@@ -1,29 +1,6 @@
 ---
 
-- hosts: parameters-mandatory
+- hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
-    - role: backup_server
-      backup_host_ssh_private_keys:
-        dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}"
-        rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}"
-        ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}"
-        ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
-
-- hosts: parameters-optional
-  become: true
-  roles:
-    - role: backup_server
-      backup_host_ssh_private_keys:
-        dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}"
-        rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}"
-        ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}"
-        ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
-      backup_clients:
-        - server: client1.backup
-          ip: 10.31.127.1
-          public_key: "{{ lookup('file', 'tests/data/ssh/client1.pub') }}"
-        - server: client2-backup
-          uid: 5001
-          ip: 10.31.127.3
-          public_key: "{{ lookup('file', 'tests/data/ssh/client2.pub') }}"
+    - backup_server