Skip to content
Snippets Groups Projects
Commit 45274560 authored by Matthew Mosesohn's avatar Matthew Mosesohn
Browse files

Disable vault role properly on ansible 2.2.0

when condition does not seem to work correctly at playbook
level for ansible 2.2.0.
parent a5cd73d0
No related branches found
No related tags found
No related merge requests found
...@@ -71,8 +71,7 @@ ...@@ -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 @@ ...@@ -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
...@@ -12,8 +12,8 @@ ...@@ -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()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment