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

diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml
index f8891b2..63d5bbf 100644 (file)
--- 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: