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
e4eda88c
Commit
e4eda88c
authored
8 years ago
by
Matthew Mosesohn
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #944 from tureus/skip-cloud-config-on-etcd
Bugfix: skip cloud_config on etcd
parents
71a3c97d
e5fdc63b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/kubernetes/preinstall/tasks/main.yml
+2
-2
2 additions, 2 deletions
roles/kubernetes/preinstall/tasks/main.yml
with
2 additions
and
2 deletions
roles/kubernetes/preinstall/tasks/main.yml
+
2
−
2
View file @
e4eda88c
...
...
@@ -156,7 +156,7 @@
dest
:
"
{{
kube_config_dir
}}/cloud_config"
group
:
"
{{
kube_cert_group
}}"
mode
:
0640
when
:
cloud_provider is defined and cloud_provider == "openstack"
when
:
inventory_hostname in groups['k8s-cluster'] and
cloud_provider is defined and cloud_provider == "openstack"
tags
:
[
cloud-provider
,
openstack
]
-
name
:
Write azure cloud-config
...
...
@@ -165,7 +165,7 @@
dest
:
"
{{
kube_config_dir
}}/cloud_config"
group
:
"
{{
kube_cert_group
}}"
mode
:
0640
when
:
cloud_provider is defined and cloud_provider == "azure"
when
:
inventory_hostname in groups['k8s-cluster'] and
cloud_provider is defined and cloud_provider == "azure"
tags
:
[
cloud-provider
,
azure
]
-
include
:
etchosts.yml
...
...
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