diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-10-26 13:15:06 +0100 |
|---|---|---|
| committer |   Tomas Sedovic <tomas@sedovic.cz> | 2016-11-07 12:19:14 +0100 |
| commit | b4bfc17728c7b1d507516d2f2ce24e2a2cc33efd (patch) | |
| tree | 3dd33ef9ed2c5f9543eb9e1e674f1e07f9482112 /firstboot | |
| parent | d106161466ca158e4b663a89beda7af1d5b67d72 (diff) | |
Add an optional extra node admin ssh key parameter
This can be used to pass the e.g. the tripleo-validations ssh key into
the deployment.
Change-Id: I861b9e2252a9c8122dcf7df261386f1ea5200c4f
Related-Bug: #1635226
Diffstat (limited to 'firstboot')
| -rw-r--r-- | firstboot/userdata_heat_admin.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml index f8891b29..63d5bbf8 100644 --- a/firstboot/userdata_heat_admin.yaml +++ b/firstboot/userdata_heat_admin.yaml @@ -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: |