From ac6c11f7aa947eb12d10d17424804bc72daaf9c9 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 5 Dec 2017 11:51:32 +0100 Subject: [PATCH] Make Kubespray install work without --private-key too It seems the ansible_ssh_private_key_file variable is only defined when --private-key parameter is passed to the main deployment Ansible run. This is always true for deploying via tripleoclient and Mistral, but may not be true when deploying via manual ansible-playbook execution. We now check whether the variable is defined before using it. If it's not defined, user's default ssh key will be used for trying to connect to the overcloud nodes. Change-Id: Id04d3bab85713d644899694231dd4009a88385af --- extraconfig/services/kubernetes-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extraconfig/services/kubernetes-master.yaml b/extraconfig/services/kubernetes-master.yaml index 81b2e1de85..098b46fb5d 100644 --- a/extraconfig/services/kubernetes-master.yaml +++ b/extraconfig/services/kubernetes-master.yaml @@ -169,7 +169,7 @@ outputs: -i '{{playbook_dir}}/kubespray/inventory.yml' --skip-tags docker,bastion-ssh-config --extra-vars '@{{playbook_dir}}/kubespray/global_vars.yml' - --private-key '{{ansible_ssh_private_key_file}}' + {% if ansible_ssh_private_key_file is defined %}--private-key '{{ansible_ssh_private_key_file}}'{% endif %} '{{playbook_dir}}/kubespray/playbook.yml' {%- endif -%} - name: print kubespray command