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

Disable vault role properly on ansible 2.2.0

Browse source 
when condition does not seem to work correctly at playbook
level for ansible 2.2.0.
This commit is contained in:
Matthew Mosesohn 2017-03-03 16:33:00 +03:00
parent a5cd73d047
commit 45274560ec
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/kubernetes/secrets/tasks/main.yml
View file

@ -71,8 +71,7 @@
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false) when: gen_tokens|default(false)
- include: gen_certs_script.yml - include: "gen_certs_{{ cert_management }}.yml"
when: cert_management == "script"
tags: k8s-secrets tags: k8s-secrets
- include: sync_kube_master_certs.yml - include: sync_kube_master_certs.yml
@ -83,9 +82,5 @@
when: cert_management == "vault" and inventory_hostname in groups['k8s-cluster'] when: cert_management == "vault" and inventory_hostname in groups['k8s-cluster']
tags: k8s-secrets tags: k8s-secrets
- include: gen_certs_vault.yml
when: cert_management == "vault"
tags: k8s-secrets
- include: gen_tokens.yml - include: gen_tokens.yml
tags: k8s-secrets tags: k8s-secrets

4
roles/vault/tasks/main.yml
View file

@ -12,8 +12,8 @@
## Bootstrap ## Bootstrap
- include: bootstrap/main.yml - include: bootstrap/main.yml
when: vault_bootstrap | d() when: cert_management == 'vault' and vault_bootstrap | d()
## Cluster ## Cluster
- include: cluster/main.yml - include: cluster/main.yml
when: not vault_bootstrap | d() when: cert_management == 'vault' and not vault_bootstrap | d()