From d40496225b3ab9e1eb9f5820e0bede6431a1e88e Mon Sep 17 00:00:00 2001 From: Dieter Verhelst Date: Tue, 28 Aug 2018 12:58:28 +0200 Subject: [PATCH 1/2] As per Ansible 2.3 it's possible to use seed from the inventory hostname. This turns 'random' numbers idempotent --- defaults/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1c637e2..ac3e6ba 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -borgbackup_required: True +borgbackup_required: true borgbackup_client_user: root borgbackup_ssh_key: "~{{ borgbackup_client_user }}/.ssh/id_borg_rsa" @@ -33,11 +33,11 @@ borgbackup_retention: yearly: 1 borgbackup_cron_day: "*" -borgbackup_cron_hour: "{{ 5|random }}" -borgbackup_cron_minute: "{{ 59|random }}" +borgbackup_cron_hour: "{{ 5|random(seed=inventory_hostname) }}" +borgbackup_cron_minute: "{{ 59|random(seed=inventory_hostname) }}" -borgbackup_appendonly: False -borgbackup_appendonly_repoconfig: False +borgbackup_appendonly: false +borgbackup_appendonly_repoconfig: false borgbackup_management_station: '' borgbackup_management_user: '' borgbackup_management_ssh_pubkey: '' From 033c923a9e6ed852342818a4c4e2d7e09559ee48 Mon Sep 17 00:00:00 2001 From: Dieter Verhelst Date: Tue, 28 Aug 2018 13:01:57 +0200 Subject: [PATCH 2/2] Undo branch-polution --- defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ac3e6ba..5a174f7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -borgbackup_required: true +borgbackup_required: True borgbackup_client_user: root borgbackup_ssh_key: "~{{ borgbackup_client_user }}/.ssh/id_borg_rsa" @@ -36,8 +36,8 @@ borgbackup_cron_day: "*" borgbackup_cron_hour: "{{ 5|random(seed=inventory_hostname) }}" borgbackup_cron_minute: "{{ 59|random(seed=inventory_hostname) }}" -borgbackup_appendonly: false -borgbackup_appendonly_repoconfig: false +borgbackup_appendonly: False +borgbackup_appendonly_repoconfig: False borgbackup_management_station: '' borgbackup_management_user: '' borgbackup_management_ssh_pubkey: ''