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
357a15ff
Commit
357a15ff
authored
8 years ago
by
Smaine Kahlouch
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #568 from kubespray/issue/452
Add new var skip_dnsmasq_k8s
parents
7fe255e5
2778ac61
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/defaults/main.yml
+7
-1
7 additions, 1 deletion
roles/dnsmasq/defaults/main.yml
roles/dnsmasq/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/dnsmasq/tasks/main.yml
with
8 additions
and
2 deletions
roles/dnsmasq/defaults/main.yml
+
7
−
1
View file @
357a15ff
...
@@ -16,4 +16,10 @@ dnsmasq_version: 2.72
...
@@ -16,4 +16,10 @@ dnsmasq_version: 2.72
# Images
# Images
dnsmasq_image_repo
:
"
andyshinn/dnsmasq"
dnsmasq_image_repo
:
"
andyshinn/dnsmasq"
dnsmasq_image_tag
:
"
{{
dnsmasq_version
}}"
dnsmasq_image_tag
:
"
{{
dnsmasq_version
}}"
\ No newline at end of file
# Skip dnsmasq setup
skip_dnsmasq
:
false
# Skip setting up dnsmasq daemonset
skip_dnsmasq_k8s
:
"
{{
skip_dnsmasq
}}"
This diff is collapsed.
Click to expand it.
roles/dnsmasq/tasks/main.yml
+
1
−
1
View file @
357a15ff
---
---
-
include
:
dnsmasq.yml
-
include
:
dnsmasq.yml
when
:
"
{{
not
skip_dnsmasq|bool
}}"
when
:
"
{{
not
skip_dnsmasq
_k8s
|bool
}}"
-
include
:
resolvconf.yml
-
include
:
resolvconf.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