Merge "Add an optional extra node admin ssh key parameter"

This commit is contained in:
Jenkins 2016-11-07 14:12:20 +00:00 committed by Gerrit Code Review
commit 2454ee755f

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: 2016-10-14
parameters:
# Can be overridden via parameter_defaults in the environment
@ -6,6 +6,10 @@ parameters:
type: string
default: heat-admin
node_admin_extra_ssh_keys:
type: comma_delimited_list
default: []
description: >
Uses cloud-init to create an additional user with a known name, in addition
to the distro-default user created by the cloud-init default.
@ -23,6 +27,8 @@ resources:
properties:
cloud_config:
user: {get_param: node_admin_username}
ssh_authorized_keys: {get_param: node_admin_extra_ssh_keys}
outputs:
OS::stack_id: