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
9c83551a
Commit
9c83551a
authored
6 years ago
by
ankitcharolia
Committed by
k8s-ci-robot
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
add certificate authority file (#3433)
parent
99c139dd
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
roles/etcd/handlers/backup.yml
+1
-0
1 addition, 0 deletions
roles/etcd/handlers/backup.yml
roles/etcd/tasks/configure.yml
+6
-0
6 additions, 0 deletions
roles/etcd/tasks/configure.yml
roles/etcd/tasks/join_etcd_member.yml
+2
-0
2 additions, 0 deletions
roles/etcd/tasks/join_etcd_member.yml
with
9 additions
and
0 deletions
roles/etcd/handlers/backup.yml
+
1
−
0
View file @
9c83551a
...
@@ -52,6 +52,7 @@
...
@@ -52,6 +52,7 @@
ETCDCTL_API
:
3
ETCDCTL_API
:
3
ETCDCTL_CERT
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
retries
:
3
retries
:
3
register
:
etcd_backup_v3_command
register
:
etcd_backup_v3_command
until
:
etcd_backup_v3_command.rc ==
0
until
:
etcd_backup_v3_command.rc ==
0
...
...
This diff is collapsed.
Click to expand it.
roles/etcd/tasks/configure.yml
+
6
−
0
View file @
9c83551a
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
name
:
Configure | Check if etcd-events cluster is healthy
-
name
:
Configure | Check if etcd-events cluster is healthy
shell
:
"
{{
bin_dir
}}/etcdctl
--endpoints={{
etcd_events_access_addresses
}}
cluster-health
|
grep
-q
'cluster
is
healthy'"
shell
:
"
{{
bin_dir
}}/etcdctl
--endpoints={{
etcd_events_access_addresses
}}
cluster-health
|
grep
-q
'cluster
is
healthy'"
...
@@ -24,6 +25,7 @@
...
@@ -24,6 +25,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
include_tasks
:
refresh_config.yml
-
include_tasks
:
refresh_config.yml
when
:
is_etcd_master
when
:
is_etcd_master
...
@@ -75,6 +77,7 @@
...
@@ -75,6 +77,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
name
:
Configure | Check if etcd-events cluster is healthy
-
name
:
Configure | Check if etcd-events cluster is healthy
shell
:
"
{{
bin_dir
}}/etcdctl
--endpoints={{
etcd_events_access_addresses
}}
cluster-health
|
grep
-q
'cluster
is
healthy'"
shell
:
"
{{
bin_dir
}}/etcdctl
--endpoints={{
etcd_events_access_addresses
}}
cluster-health
|
grep
-q
'cluster
is
healthy'"
...
@@ -91,6 +94,7 @@
...
@@ -91,6 +94,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
name
:
Configure | Check if member is in etcd cluster
-
name
:
Configure | Check if member is in etcd cluster
shell
:
"
{{
bin_dir
}}/etcdctl
--no-sync
--endpoints={{
etcd_access_addresses
}}
member
list
|
grep
-q
{{
etcd_access_address
}}"
shell
:
"
{{
bin_dir
}}/etcdctl
--no-sync
--endpoints={{
etcd_access_addresses
}}
member
list
|
grep
-q
{{
etcd_access_address
}}"
...
@@ -104,6 +108,7 @@
...
@@ -104,6 +108,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
name
:
Configure | Check if member is in etcd-events cluster
-
name
:
Configure | Check if member is in etcd-events cluster
shell
:
"
{{
bin_dir
}}/etcdctl
--no-sync
--endpoints={{
etcd_events_access_addresses
}}
member
list
|
grep
-q
{{
etcd_access_address
}}"
shell
:
"
{{
bin_dir
}}/etcdctl
--no-sync
--endpoints={{
etcd_events_access_addresses
}}
member
list
|
grep
-q
{{
etcd_access_address
}}"
...
@@ -117,6 +122,7 @@
...
@@ -117,6 +122,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
name
:
Configure | Join member(s) to etcd cluster one at a time
-
name
:
Configure | Join member(s) to etcd cluster one at a time
include_tasks
:
join_etcd_member.yml
include_tasks
:
join_etcd_member.yml
...
...
This diff is collapsed.
Click to expand it.
roles/etcd/tasks/join_etcd_member.yml
+
2
−
0
View file @
9c83551a
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
-
include_tasks
:
refresh_config.yml
-
include_tasks
:
refresh_config.yml
vars
:
vars
:
...
@@ -34,3 +35,4 @@
...
@@ -34,3 +35,4 @@
environment
:
environment
:
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_CERT_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_KEY_FILE
:
"
{{
etcd_cert_dir
}}/admin-{{
inventory_hostname
}}-key.pem"
ETCDCTL_CA_FILE
:
"
{{
etcd_cert_dir
}}/ca.pem"
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