C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change wait for dnsmasq to skip if there are no kube-nodes in play

Browse source 
Also changed unnecessary delay to a max timeout (now defaulting to 1s sleep
between tries)

Also rename play_hosts to ansible_play_hosts
This commit is contained in:
Matthew Mosesohn 2017-03-21 12:31:47 +03:00
parent b7fbf19c91
commit 51985ab9de
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}) -%}