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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
7e140e5f
Unverified
Commit
7e140e5f
authored
Sep 5, 2018
by
Antoine Legrand
Committed by
GitHub
Sep 5, 2018
Browse files
Options
Downloads
Plain Diff
Merge pull request #3122 from jbcraig/fix_cacert_feature
resolve issues with new cacert feature
parents
0e5393f2
4d783fff
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/node/tasks/main.yml
+14
-0
14 additions, 0 deletions
roles/kubernetes/node/tasks/main.yml
roles/kubernetes/preinstall/tasks/main.yml
+0
-14
0 additions, 14 deletions
roles/kubernetes/preinstall/tasks/main.yml
with
14 additions
and
14 deletions
roles/kubernetes/node/tasks/main.yml
+
14
−
0
View file @
7e140e5f
...
@@ -157,6 +157,20 @@
...
@@ -157,6 +157,20 @@
-
cloud-provider
-
cloud-provider
-
facts
-
facts
-
name
:
Write cacert file
copy
:
src
:
"
{{
openstack_cacert
}}"
dest
:
"
{{
kube_config_dir
}}/openstack-cacert.pem"
group
:
"
{{
kube_cert_group
}}"
mode
:
0640
when
:
-
inventory_hostname in groups['k8s-cluster']
-
cloud_provider is defined
-
cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
-
openstack_cacert is defined
tags
:
-
cloud-provider
-
name
:
Write cloud-config
-
name
:
Write cloud-config
template
:
template
:
src
:
"
{{
cloud_provider
}}-cloud-config.j2"
src
:
"
{{
cloud_provider
}}-cloud-config.j2"
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/preinstall/tasks/main.yml
+
0
−
14
View file @
7e140e5f
...
@@ -72,17 +72,3 @@
...
@@ -72,17 +72,3 @@
-
ansible_distribution in ["CentOS","RedHat"]
-
ansible_distribution in ["CentOS","RedHat"]
tags
:
tags
:
-
bootstrap-os
-
bootstrap-os
-
name
:
Write cacert file
copy
:
content
:
"
{{
openstack_cacert
}}"
dest
:
"
{{
kube_config_dir
}}/openstack-cacert.pem"
group
:
"
{{
kube_cert_group
}}"
mode
:
0640
when
:
-
inventory_hostname in groups['k8s-cluster']
-
cloud_provider is defined
-
cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
-
openstack_cacert is defined
tags
:
-
cloud-provider
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