openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Default Octavia SSH pub key to UC default keypair"

Browse Source
This commit is contained in:
Zuul 2018-05-14 23:16:59 +00:00 committed by Gerrit Code Review
commit b005e2284c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/services/octavia/octavia-deployment-config.yaml
View File

@ -59,7 +59,7 @@ parameters:
description: SSH key name. description: SSH key name.
OctaviaAmphoraSshKeyFile: OctaviaAmphoraSshKeyFile:
type: string type: string
default: '/home/stack/.ssh/id_rsa.pub' default: ''
description: Public key file path. User will be able to SSH into amphorae description: Public key file path. User will be able to SSH into amphorae
with the provided key. User may, in most cases, also elevate to root with the provided key. User may, in most cases, also elevate to root
from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL) from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL)
@ -145,6 +145,11 @@ parameters:
type: string type: string
default: 'service' default: 'service'
resources:
default_key_pair:
type: OS::Nova::KeyPair
external_id: default
outputs: outputs:
role_data: role_data:
description: Role data for the Octavia configuration service description: Role data for the Octavia configuration service
@ -167,6 +172,7 @@ outputs:
amp_image_tag: { get_param: OctaviaAmphoraImageTag } amp_image_tag: { get_param: OctaviaAmphoraImageTag }
amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName } amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName }
amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile } amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile }
amp_ssh_key_data: { get_attr: [default_key_pair, public_key] }
auth_username: { get_param: OctaviaUserName } auth_username: { get_param: OctaviaUserName }
auth_password: { get_param: OctaviaPassword } auth_password: { get_param: OctaviaPassword }
auth_project_name: { get_param: OctaviaProjectName } auth_project_name: { get_param: OctaviaProjectName }

3
releasenotes/notes/default-octavia-ssh-pub-key-to-keypair-70377d43bf76a407.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Default Octavia SSH public key to 'default' keypair from undercloud.