summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-07 14:12:20 +0000
committerGerrit Code Review <review@openstack.org>2016-11-07 14:12:20 +0000
commit2454ee755f0c316e8b362a3757beb2484e6625ae (patch)
treecc2c8ebb3b850961c517a7653510bce3394824e7
parentf761bf9e35f8f096127b1956f4ea8900c7d3fee5 (diff)
parentb4bfc17728c7b1d507516d2f2ce24e2a2cc33efd (diff)
Merge "Add an optional extra node admin ssh key parameter"
-rw-r--r--firstboot/userdata_heat_admin.yaml8
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: