From 4ba237c5d80994cab0851a53333c3ad72d09cf6c Mon Sep 17 00:00:00 2001 From: gdmelloatpoints Date: Mon, 26 Jun 2017 09:42:30 -0400 Subject: [PATCH 1/2] Make etcd_backup_prefix configurable. Ensures that backups can be stored on a different location other than ${HOST}/var/backups, say an EBS volume on AWS. --- inventory/group_vars/all.yml | 3 +++ roles/etcd/handlers/backup.yml | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 6388ca7af..997386728 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -4,6 +4,9 @@ bootstrap_os: none #Directory where etcd data stored etcd_data_dir: /var/lib/etcd +#Directory where etcd backups are stored on the host +etcd_backup_prefix: /var/backups + # Directory where the binaries will be installed bin_dir: /usr/local/bin diff --git a/roles/etcd/handlers/backup.yml b/roles/etcd/handlers/backup.yml index 9a611296b..68fe71f07 100644 --- a/roles/etcd/handlers/backup.yml +++ b/roles/etcd/handlers/backup.yml @@ -3,7 +3,6 @@ command: /bin/true notify: - Refresh Time Fact - - Set etcd Backup Directory Prefix - Set Backup Directory - Create Backup Directory - Backup etcd v2 data @@ -13,10 +12,6 @@ - name: Refresh Time Fact setup: filter=ansible_date_time -- name: Set etcd Backup Directory Prefix - set_fact: - etcd_backup_prefix: '/var/backups' - - name: Set Backup Directory set_fact: etcd_backup_directory: "{{ etcd_backup_prefix }}/etcd-{{ ansible_date_time.date }}_{{ ansible_date_time.time }}" From 3123502f4c5aed29938252c62f61fa10a032eba3 Mon Sep 17 00:00:00 2001 From: gdmelloatpoints Date: Tue, 27 Jun 2017 09:12:34 -0400 Subject: [PATCH 2/2] move `etcd_backup_prefix` to new home. --- inventory/group_vars/all.yml | 3 --- roles/etcd/defaults/main.yml | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 997386728..6388ca7af 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -4,9 +4,6 @@ bootstrap_os: none #Directory where etcd data stored etcd_data_dir: /var/lib/etcd -#Directory where etcd backups are stored on the host -etcd_backup_prefix: /var/backups - # Directory where the binaries will be installed bin_dir: /usr/local/bin diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml index 6326741b3..8fd72f3db 100644 --- a/roles/etcd/defaults/main.yml +++ b/roles/etcd/defaults/main.yml @@ -2,6 +2,7 @@ # Set to false to only do certificate management etcd_cluster_setup: true +etcd_backup_prefix: "/var/backups" etcd_bin_dir: "{{ local_release_dir }}/etcd/etcd-{{ etcd_version }}-linux-amd64/" etcd_data_dir: "/var/lib/etcd"