From 56806978469639867d01b33e6f1ceab0cc4078cb 2023-11-26 22:51:39
From: Branko Majic <branko@majic.rs>
Date: 2023-11-26 22:51:39
Subject: [PATCH] MAR-189: Refactor hostname pattern for backup_client role (buster/bullseye/bookworm):

- Multiple releases one after the other have names that begin with
  letter b, making it necessary to use more than just one letter.
- Use full distro codename, but shorten the parameters to param in
  order to avoid issues related to 32-character username limits (when
  bak-HOSTNAME user gets created).
- Drop some leftover references to Debian Stretch.
- Drop the arch from hostnames - default is to use 64-bit boxes
  anyway.

---

diff --git a/roles/backup_client/molecule/default/molecule.yml b/roles/backup_client/molecule/default/molecule.yml
index dd5a154133386ff6c4eba0a9f95314971eb8087c..f8b634c7e83ae702c1aa5c4568dcec01ca948d72 100644
--- a/roles/backup_client/molecule/default/molecule.yml
+++ b/roles/backup_client/molecule/default/molecule.yml
@@ -27,7 +27,7 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-b64
+  - name: param-mandatory-buster
     groups:
       - parameters-mandatory
     box: debian/contrib-buster64
@@ -39,7 +39,7 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-optional-b64
+  - name: param-optional-buster
     groups:
       - parameters-optional
     box: debian/contrib-buster64
diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml
index cbf873b019caa40803532c5e47005ea393e4ffb3..8bf085c6f7df3a7fdb8133d90fa225d7a19ceb9a 100644
--- a/roles/backup_client/molecule/default/prepare.yml
+++ b/roles/backup_client/molecule/default/prepare.yml
@@ -85,8 +85,8 @@
         mode: 0755
       with_items:
         - /home/backupuser
-        - /home/bak-parameters-mandatory-s64
-        - /home/bak-parameters-mandatory-b64
+        - /home/bak-param-mandatory-buster
+        - /home/bak-param-mandatory-buster
 
     - name: Set-up duplicity backup directories
       file:
@@ -106,8 +106,7 @@
         group: backupuser
         mode: 0700
       with_items:
-        - "parameters-optional-s64"
-        - "parameters-optional-b64"
+        - "param-optional-buster"
 
   handlers:
     - name: Restart ssh
@@ -117,9 +116,7 @@
 
   vars:
     backup_users:
-      - name: bak-parameters-mandatory-s64
-        key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
-      - name: bak-parameters-mandatory-b64
+      - name: bak-param-mandatory-buster
         key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
       - name: backupuser
         key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"