X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=firstboot%2Fuserdata_heat_admin.yaml;h=ed8302dc4faef441aca4d40eaccaaf7628209b57;hb=720c595ab6b89450f190259292e205b0e91f773e;hp=f8891b2947104ff52c73916497f85a1e585d46a3;hpb=c40f2a3b67274e9c7133ce9fd44d8635a8aa4674;p=apex-tripleo-heat-templates.git

diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml
index f8891b29..ed8302dc 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: ocata
 
 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: