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
652cbede
Commit
652cbede
authored
8 years ago
by
Smaine Kahlouch
Browse files
Options
Downloads
Plain Diff
Merge pull request #192 from oneswig/coreos-fixes
Coreos fixes
parents
2192bccc
bf96b92d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/dnsmasq/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/dnsmasq/tasks/main.yml
roles/docker/defaults/main.yml
+9
-0
9 additions, 0 deletions
roles/docker/defaults/main.yml
with
10 additions
and
1 deletion
roles/dnsmasq/tasks/main.yml
+
1
−
1
View file @
652cbede
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
kube
:
kube
:
name
:
dnsmasq
name
:
dnsmasq
namespace
:
kube-system
namespace
:
kube-system
kubectl
:
/usr/local/bin
/kubectl
kubectl
:
"
{{bin_dir}}
/kubectl
"
resource
:
"
{{item.item.type}}"
resource
:
"
{{item.item.type}}"
filename
:
/etc/kubernetes/{{item.item.file}}
filename
:
/etc/kubernetes/{{item.item.file}}
state
:
"
{{item.changed
|
ternary('latest','present')
}}"
state
:
"
{{item.changed
|
ternary('latest','present')
}}"
...
...
This diff is collapsed.
Click to expand it.
roles/docker/defaults/main.yml
+
9
−
0
View file @
652cbede
docker_version
:
1.10
docker_version
:
1.10
docker_package_info
:
pkgs
:
docker_repo_key_info
:
repo_keys
:
docker_repo_info
:
repos
:
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