diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-27 15:59:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 15:59:10 -0700 |
| commit | ead22bb1c3b6d6366502b14b97b7aae5605f8a58 (patch) | |
| tree | 02735c408728d8cdc83e2ec02792f733bcfb6c29 /roles/etcd | |
| parent | 3462d2dcf1a35d0cb81314de4cee44863e9cd85d (diff) | |
| parent | d075df2e9eb45f007f35cde2d502d32ee8d14faf (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | roles/etcd/tasks/upgrade/upgrade_image.yml | 5 | ||||
| -rw-r--r-- | roles/etcd/tasks/upgrade/upgrade_rpm.yml | 5 | ||||
| -rw-r--r-- | roles/etcd/templates/etcd.conf.j2 | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 36808241f..18164050a 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -87,3 +87,6 @@ r_etcd_os_firewall_allow: port: "{{etcd_client_port}}/tcp" - service: etcd peering port: "{{ etcd_peer_port }}/tcp" + +# set the backend quota to 4GB by default +etcd_quota_backend_bytes: 4294967296 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 }}" diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2 index 2c2803aee..8462bb4c8 100644 --- a/roles/etcd/templates/etcd.conf.j2 +++ b/roles/etcd/templates/etcd.conf.j2 @@ -45,6 +45,7 @@ ETCD_ADVERTISE_CLIENT_URLS={{ etcd_advertise_client_urls }} #ETCD_STRICT_RECONFIG_CHECK="false" #ETCD_AUTO_COMPACTION_RETENTION="0" #ETCD_ENABLE_V2="true" +ETCD_QUOTA_BACKEND_BYTES={{ etcd_quota_backend_bytes }} #[proxy] #ETCD_PROXY=off |