diff --git a/create-remote-database-backup.yml b/create-remote-database-backup.yml index be781f3..dffcd07 100644 --- a/create-remote-database-backup.yml +++ b/create-remote-database-backup.yml @@ -63,6 +63,7 @@ - hosts: "postgres:maria" serial: "{{ serial_number | default(1) }}" + gather_facts: false vars: current_date_time: '{{ get_current_date_time }}' @@ -78,6 +79,7 @@ - hosts: "postgres:maria:storage" serial: "{{ serial_number | default(5) }}" + gather_facts: false vars: storageserver_system_user: 'backuphamster' @@ -96,7 +98,7 @@ - name: "Cleanup remote backup dirs: {{ database_engine }}" become: yes file: - path: '{{ backup_directory }}/{{ database_engine }}/{{ ansible_date_time.date }}' + path: '{{ backup_directory }}/{{ database_engine }}/{{ get_current_date }}' state: absent when: - not inventory_hostname in groups['storage'] diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml index 75f6fbb..cc3e939 100644 --- a/group_vars/all/plain.yml +++ b/group_vars/all/plain.yml @@ -200,6 +200,7 @@ blackbox_http_2xx_additional_targets: [] prometheus_federation_enabled: true kubernetes_prometheus_endpoint: "{{ stage }}-kube-prometheus.{{ domain }}" +get_current_date: "{{ lookup('pipe','date +%Y-%m-%d') }}" get_current_date_time: "{{ lookup('pipe','date +%Y-%m-%d_%H:%M') }}" hcloud_firewall_objects: diff --git a/roles/maria/defaults/main.yml b/roles/maria/defaults/main.yml index ba3835c..24b351e 100644 --- a/roles/maria/defaults/main.yml +++ b/roles/maria/defaults/main.yml @@ -1,5 +1,5 @@ --- my_cnf_file: '/root/.my.cnf' database_engine: maria -backup_dest_dir: "{{ backup_directory }}/{{ database_engine }}/{{ ansible_date_time.date }}" +backup_dest_dir: "{{ backup_directory }}/{{ database_engine }}/{{ get_current_date }}" backup_status_file: '{{ backup_dest_dir }}/backup_finished' diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml index fe6b133..10406b3 100644 --- a/roles/postgres/defaults/main.yml +++ b/roles/postgres/defaults/main.yml @@ -19,5 +19,5 @@ database_state: present postgres_listen_addresses: "listen_addresses = 'localhost,{{ stage_private_server_ip }}'" database_engine: postgres -backup_dest_dir: "{{ backup_directory }}/{{ database_engine }}/{{ ansible_date_time.date }}" +backup_dest_dir: "{{ backup_directory }}/{{ database_engine }}/{{ get_current_date }}" backup_status_file: '{{ backup_dest_dir }}/backup_finished'