openstack/bifrost
Code Issues Proposed changes

Fix condition for include ssh_public_key_path

Browse Source 
Regarding description in README, ssh_public_key if defined, should override
key from ssh_public_key_path. ssh_public_key_path is defined always
and has default value. Generating configdrive breaks if ssh_public_key is
defined and ssh_public_key_path is not exists.

Change-Id: I82fa8680673f8149faa1db6fe14941a5b9c907e9
This commit is contained in:
Andrey Shestakov 2017-01-03 17:07:19 +02:00
parent 0128ca8638
commit 3f58451134
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
View File

@ -17,9 +17,9 @@
- name: "Update facts from ironic to fill in any missing values"
include: update_facts_from_ironic.yaml
- name: "Identify ssh_public_key if ssh_public_key_path is defined"
- name: "Identify ssh_public_key from ssh_public_key_path"
include: ssh_public_key_path.yaml
when: ssh_public_key is undefined and ssh_public_key_path is defined
when: ssh_public_key is undefined
- name: "Make temporary folder to build configdrive"
local_action: command mktemp -d