kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1167 from mattymo/dnsmasq_when_deploying_master 

Change wait for dnsmasq to skip if there are no kube-nodes in play
pull/1175/head
Matthew Mosesohn 2017-03-22 17:59:56 +03:00 committed by GitHub
parent 04746fc4d8 1887e984a0
commit 0e3b7127b5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/dnsmasq/tasks/main.yml
View File

@ -77,6 +77,6 @@
wait_for: wait_for:
host: "{{dns_server}}" host: "{{dns_server}}"
port: 53 port: 53
delay: 5 timeout: 180
when: inventory_hostname == groups['kube-node'][0] when: inventory_hostname == groups['kube-node'][0] and groups['kube-node'][0] in ansible_play_hosts

2
roles/kubernetes/secrets/tasks/check-tokens.yml
View File

@ -27,7 +27,7 @@
sync_tokens: true sync_tokens: true
when: >- when: >-
{%- set tokens = {'sync': False} -%} {%- set tokens = {'sync': False} -%}
{%- for server in groups['kube-master'] | intersect(play_hosts) {%- for server in groups['kube-master'] | intersect(ansible_play_hosts)
if (not hostvars[server].known_tokens.stat.exists) or if (not hostvars[server].known_tokens.stat.exists) or
(hostvars[server].known_tokens.stat.checksum != known_tokens_master.stat.checksum|default('')) -%} (hostvars[server].known_tokens.stat.checksum != known_tokens_master.stat.checksum|default('')) -%}
{%- set _ = tokens.update({'sync': True}) -%} {%- set _ = tokens.update({'sync': True}) -%}