C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove variable 'etcd_ionice', because ionice removed from container image etcd:v3.4.x (#6735)

Browse source
This commit is contained in:
Sergey 2020-09-23 22:34:05 +03:00 committed by GitHub
parent 6141b98bf8
commit c0fd5b2e84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/etcd/defaults/main.yml
View file

@ -29,11 +29,6 @@ etcd_election_timeout: "5000"
# etcd_snapshot_count: "10000" # etcd_snapshot_count: "10000"
# Parameters for ionice
# -c takes an integer between 0 and 3 or one of the strings none, realtime, best-effort or idle.
# -n takes an integer between 0 (highest priority) and 7 (lowest priority)
# etcd_ionice: "-c2 -n0"
etcd_metrics: "basic" etcd_metrics: "basic"
# Uncomment to set a separate port for etcd to expose metrics on # Uncomment to set a separate port for etcd to expose metrics on

3
roles/etcd/templates/etcd.j2
View file

@ -17,8 +17,5 @@
{% endif %} {% endif %}
--name={{ etcd_member_name | default("etcd") }} \ --name={{ etcd_member_name | default("etcd") }} \
{{ etcd_image_repo }}:{{ etcd_image_tag }} \ {{ etcd_image_repo }}:{{ etcd_image_tag }} \
{% if etcd_ionice is defined %}
/bin/ionice {{ etcd_ionice }} \
{% endif %}
/usr/local/bin/etcd \ /usr/local/bin/etcd \
"$@" "$@"

5
roles/kubernetes/master/defaults/main/etcd.yml
View file

@ -13,11 +13,6 @@ etcd_election_timeout: "5000"
# etcd_snapshot_count: "10000" # etcd_snapshot_count: "10000"
# Parameters for ionice
# -c takes an integer between 0 and 3 or one of the strings none, realtime, best-effort or idle.
# -n takes an integer between 0 (highest priority) and 7 (lowest priority)
# etcd_ionice: "-c2 -n0"
etcd_metrics: "basic" etcd_metrics: "basic"
## A dictionary of extra environment variables to add to etcd.env, formatted like: ## A dictionary of extra environment variables to add to etcd.env, formatted like: