Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

859f6322

Commit 859f6322 authored 9 years ago by Antoine Legrand

Downloads
- Plain Diff

Merge branch 'master' into add_set_remote_user

parents f68d8f37 815c5fa4

No related branches found

No related tags found

Loading

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

roles/apps/k8s-kubedns 1 addition, 1 deletion

roles/apps/k8s-kubedns
roles/dnsmasq/tasks/main.yml 16 additions, 8 deletions

roles/dnsmasq/tasks/main.yml
roles/dnsmasq/templates/01-kube-dns.conf.j2 3 additions, 2 deletions

roles/dnsmasq/templates/01-kube-dns.conf.j2
roles/kubernetes/node/tasks/secrets.yml 0 additions, 1 deletion

roles/kubernetes/node/tasks/secrets.yml
roles/network_plugin/handlers/main.yml 6 additions, 0 deletions

roles/network_plugin/handlers/main.yml

with 26 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment