External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-23 14:06:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1112 from mattymo/skip_vault_if_disabled

Browse Source 
Disable vault role properly on ansible 2.2.0
This commit is contained in:
Antoine Legrand
2017-03-06 11:27:53 +01:00
committed by GitHub
parent d76816d043 45274560ec
commit ee5f009b95
2 changed files with 3 additions and 8 deletions
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]}}"
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