summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks
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 /roles/etcd/tasks
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 'roles/etcd/tasks')
-rw-r--r--roles/etcd/tasks/upgrade/upgrade_image.yml5
-rw-r--r--roles/etcd/tasks/upgrade/upgrade_rpm.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/etcd/tasks/upgrade/upgrade_image.yml b/roles/etcd/tasks/upgrade/upgrade_image.yml
index cea95a1b3..24071f9ad 100644
--- a/roles/etcd/tasks/upgrade/upgrade_image.yml
+++ b/roles/etcd/tasks/upgrade/upgrade_image.yml
@@ -20,6 +20,11 @@
regexp: "{{ current_image.stdout }}$"
replace: "{{ new_etcd_image }}"
+- lineinfile:
+ destfile: "{{ etcd_conf_file }}"
+ regexp: '^ETCD_QUOTA_BACKEND_BYTES='
+ line: "ETCD_QUOTA_BACKEND_BYTES={{ etcd_quota_backend_bytes }}"
+
- name: Restart etcd_container
systemd:
name: "{{ etcd_service }}"
diff --git a/roles/etcd/tasks/upgrade/upgrade_rpm.yml b/roles/etcd/tasks/upgrade/upgrade_rpm.yml
index 324b69605..505e28afb 100644
--- a/roles/etcd/tasks/upgrade/upgrade_rpm.yml
+++ b/roles/etcd/tasks/upgrade/upgrade_rpm.yml
@@ -19,6 +19,11 @@
name: "{{ l_etcd_target_package }}"
state: latest
+- lineinfile:
+ destfile: "{{ etcd_conf_file }}"
+ regexp: '^ETCD_QUOTA_BACKEND_BYTES='
+ line: "ETCD_QUOTA_BACKEND_BYTES={{ etcd_quota_backend_bytes }}"
+
- name: Restart etcd
service:
name: "{{ etcd_service }}"