X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=firstboot%2Fuserdata_heat_admin.yaml;h=63d5bbf8ef9d6c76b0c9eff31aaa24eb43653b34;hb=e2e0f9db0cbc995d5504b3931855af85be5b26b7;hp=73481c63378f356a38fdf6ab6cdaaf6d74978ea6;hpb=c250a76aa366c49d70e37253352684ecc8e3a24f;p=apex-tripleo-heat-templates.git

diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml
index 73481c63..63d5bbf8 100644
--- a/firstboot/userdata_heat_admin.yaml
+++ b/firstboot/userdata_heat_admin.yaml
@@ -1,11 +1,15 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2016-10-14
 
 parameters:
-  # Can be overriden via parameter_defaults in the environment
+  # Can be overridden via parameter_defaults in the environment
   node_admin_username:
     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: