diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-13 06:40:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 06:40:58 -0400 |
| commit | e1754cbde4aeddfb5bc0d58984510c648de7ced4 (patch) | |
| tree | dd12c54299d678ed654f490cb2eb6af6dfbef95d | |
| parent | da1b27cbc9294993343c6dee3065a6b57aa148c2 (diff) | |
| parent | 0f032bf5b92688d59b74f5f2900f8be7d9631a20 (diff) | |
| download | openshift-e1754cbde4aeddfb5bc0d58984510c648de7ced4.tar.gz openshift-e1754cbde4aeddfb5bc0d58984510c648de7ced4.tar.bz2 openshift-e1754cbde4aeddfb5bc0d58984510c648de7ced4.tar.xz openshift-e1754cbde4aeddfb5bc0d58984510c648de7ced4.zip | |
Merge pull request #5377 from ingvagabund/double-required-disk-space-etcd-backup
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/backup.yml | 2 | ||||
| -rw-r--r-- | roles/etcd_common/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/etcd_common/tasks/backup.yml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml index 616ba04f8..2cc6c9019 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml @@ -2,7 +2,7 @@ - name: Backup etcd hosts: oo_etcd_hosts_to_backup roles: - - role: openshift_facts + - role: openshift_etcd_facts - role: etcd_common r_etcd_common_action: backup r_etcd_common_backup_tag: etcd_backup_tag diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index 89993f7ea..b67411f40 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -56,7 +56,7 @@ etcd_is_containerized: False etcd_is_thirdparty: False # etcd dir vars -etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' if openshift.common.etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/' }}" +etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/' }}" # etcd ports and protocols etcd_client_port: 2379 diff --git a/roles/etcd_common/tasks/backup.yml b/roles/etcd_common/tasks/backup.yml index 2bc486d3f..c1580640f 100644 --- a/roles/etcd_common/tasks/backup.yml +++ b/roles/etcd_common/tasks/backup.yml @@ -29,7 +29,6 @@ - name: Check current etcd disk usage shell: du --exclude='*openshift-backup*' -k {{ l_etcd_data_dir }} | tail -n 1 | cut -f1 register: l_etcd_disk_usage - when: r_etcd_common_embedded_etcd | bool # AUDIT:changed_when: `false` because we are only inspecting # state, not manipulating anything changed_when: false @@ -39,7 +38,7 @@ msg: > {{ l_etcd_disk_usage.stdout }} Kb disk space required for etcd backup, {{ l_avail_disk.stdout }} Kb available. - when: (r_etcd_common_embedded_etcd | bool) and (l_etcd_disk_usage.stdout|int > l_avail_disk.stdout|int) + when: l_etcd_disk_usage.stdout|int*2 > l_avail_disk.stdout|int # For non containerized and non embedded we should have the correct version of # etcd installed already. So don't do anything. |