summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-27 15:59:10 -0700
committerGitHub <noreply@github.com>2017-09-27 15:59:10 -0700
commitead22bb1c3b6d6366502b14b97b7aae5605f8a58 (patch)
tree02735c408728d8cdc83e2ec02792f733bcfb6c29 /playbooks/common
parent3462d2dcf1a35d0cb81314de4cee44863e9cd85d (diff)
parentd075df2e9eb45f007f35cde2d502d32ee8d14faf (diff)
downloadopenshift-ead22bb1c3b6d6366502b14b97b7aae5605f8a58.tar.gz
openshift-ead22bb1c3b6d6366502b14b97b7aae5605f8a58.tar.bz2
openshift-ead22bb1c3b6d6366502b14b97b7aae5605f8a58.tar.xz
openshift-ead22bb1c3b6d6366502b14b97b7aae5605f8a58.zip
Merge pull request #5518 from ingvagabund/set-quota-backend-bytes-explicitly
Automatic merge from submit-queue set the etcd backend quota to 4GB by default Bug: 1492891
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/main.yml6
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml6
2 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
index 5c8467a4e..5b8ba3bb2 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
@@ -21,3 +21,9 @@
- name: Perform etcd upgrade
include: ./upgrade.yml
when: openshift_etcd_upgrade | default(true) | bool
+
+- name: Backup etcd
+ include: backup.yml
+ vars:
+ etcd_backup_tag: "post-3.0-"
+ when: openshift_etcd_backup | default(true) | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
index a3446ef84..d71c96cd7 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
@@ -106,9 +106,3 @@
when:
- ansible_distribution == 'Fedora'
- not openshift.common.is_containerized | bool
-
-- name: Backup etcd
- include: backup.yml
- vars:
- etcd_backup_tag: "post-3.0-"
- when: openshift_etcd_backup | default(true) | bool