openstack/bifrost
Code Issues Proposed changes

Merge "Use env lookup to determine HOME for SSH pubkey"

Browse Source
This commit is contained in:
Jenkins 2017-03-21 15:57:28 +00:00 committed by Gerrit Code Review
commit b571d0d3b5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/inventory/group_vars/baremetal
View File

@ -9,7 +9,7 @@
# The path to the SSH key to be utilized for testing and burn-in
# to configuration drives. When set, it should be set in both baremetal
# and localhost groups, however this is only an override to the default.
# ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
# ssh_public_key_path: "{{ lookup('env', 'HOME') }}/.ssh/id_rsa.pub"
# Normally this user should be root, however if cirros is used,
# a user may wish to define a specific user for testing VM

2
playbooks/inventory/group_vars/localhost
View File

@ -17,7 +17,7 @@ mysql_password:
# The path to the SSH key to be utilized for testing and burn-in
# to configuration drives. When set, it should be set in both baremetal
# and localhost groups, however this is only an override to the default.
# ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
# ssh_public_key_path: "{{ lookup('env', 'HOME') }}/.ssh/id_rsa.pub"
# If testing is true, then the environment is setup for using libvirt
# virtual machines for the hardware instead of real hardware.

2
playbooks/inventory/group_vars/target
View File

@ -17,7 +17,7 @@ mysql_password:
# The path to the SSH key to be utilized for testing and burn-in
# to configuration drives. When set, it should be set in both baremetal
# and localhost groups, however this is only an override to the default.
# ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
# ssh_public_key_path: "{{ lookup('env', 'HOME') }}/.ssh/id_rsa.pub"
# If testing is true, then the environment is setup for using libvirt
# virtual machines for the hardware instead of real hardware.

2
playbooks/roles/bifrost-configdrives-dynamic/defaults/main.yml
View File

@ -6,7 +6,7 @@
write_interfaces_file: false
http_boot_folder: /httpboot
# Default location to the ssh public key for the user operating Bifrost.
ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
ssh_public_key_path: "{{ lookup('env', 'HOME') }}/.ssh/id_rsa.pub"
# Default interface name
# TODO(TheJulia): Remove this default.