Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
c0fd5b2e
Unverified
Commit
c0fd5b2e
authored
4 years ago
by
Sergey
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
remove variable 'etcd_ionice', because ionice removed from container image etcd:v3.4.x (#6735)
parent
6141b98b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
roles/etcd/defaults/main.yml
+0
-5
0 additions, 5 deletions
roles/etcd/defaults/main.yml
roles/etcd/templates/etcd.j2
+0
-3
0 additions, 3 deletions
roles/etcd/templates/etcd.j2
roles/kubernetes/master/defaults/main/etcd.yml
+0
-5
0 additions, 5 deletions
roles/kubernetes/master/defaults/main/etcd.yml
with
0 additions
and
13 deletions
roles/etcd/defaults/main.yml
+
0
−
5
View file @
c0fd5b2e
...
...
@@ -29,11 +29,6 @@ etcd_election_timeout: "5000"
# 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"
# Uncomment to set a separate port for etcd to expose metrics on
...
...
This diff is collapsed.
Click to expand it.
roles/etcd/templates/etcd.j2
+
0
−
3
View file @
c0fd5b2e
...
...
@@ -17,8 +17,5 @@
{
% endif %
}
--name
={{
etcd_member_name | default
(
"etcd"
)
}}
\
{{
etcd_image_repo
}}
:
{{
etcd_image_tag
}}
\
{
%
if
etcd_ionice is defined %
}
/bin/ionice
{{
etcd_ionice
}}
\
{
% endif %
}
/usr/local/bin/etcd
\
"
$@
"
This diff is collapsed.
Click to expand it.
roles/kubernetes/master/defaults/main/etcd.yml
+
0
−
5
View file @
c0fd5b2e
...
...
@@ -13,11 +13,6 @@ etcd_election_timeout: "5000"
# 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"
## A dictionary of extra environment variables to add to etcd.env, formatted like:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment