Merge pull request #1112 from mattymo/skip_vault_if_disabled
Disable vault role properly on ansible 2.2.0
This commit is contained in:
commit
ee5f009b95
2 changed files with 3 additions and 8 deletions
|
@ -71,8 +71,7 @@
|
|||
delegate_to: "{{groups['kube-master'][0]}}"
|
||||
when: gen_tokens|default(false)
|
||||
|
||||
- include: gen_certs_script.yml
|
||||
when: cert_management == "script"
|
||||
- include: "gen_certs_{{ cert_management }}.yml"
|
||||
tags: k8s-secrets
|
||||
|
||||
- include: sync_kube_master_certs.yml
|
||||
|
@ -83,9 +82,5 @@
|
|||
when: cert_management == "vault" and inventory_hostname in groups['k8s-cluster']
|
||||
tags: k8s-secrets
|
||||
|
||||
- include: gen_certs_vault.yml
|
||||
when: cert_management == "vault"
|
||||
tags: k8s-secrets
|
||||
|
||||
- include: gen_tokens.yml
|
||||
tags: k8s-secrets
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
## Bootstrap
|
||||
- include: bootstrap/main.yml
|
||||
when: vault_bootstrap | d()
|
||||
when: cert_management == 'vault' and vault_bootstrap | d()
|
||||
|
||||
## Cluster
|
||||
- include: cluster/main.yml
|
||||
when: not vault_bootstrap | d()
|
||||
when: cert_management == 'vault' and not vault_bootstrap | d()
|
||||
|
|
Loading…
Reference in a new issue