summaryrefslogtreecommitdiffstats
path: root/firstboot
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-09 04:41:12 +0000
committerGerrit Code Review <review@openstack.org>2017-08-09 04:41:12 +0000
commitee5a92b9539a490ac7a0097439b6154bffe6d08a (patch)
treedf3b769b95a0ce297cb28f282125d424db76ec9e /firstboot
parente32150bd45d9957b459028812abd9ba7faaf43c7 (diff)
parent05f773006a0f8f1ea50ba23bfaa16ef68ef6ec55 (diff)
Merge "Don't curl metadata server in userdata example"
Diffstat (limited to 'firstboot')
-rw-r--r--firstboot/userdata_example.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/firstboot/userdata_example.yaml b/firstboot/userdata_example.yaml
index 2f03c83b..32da7eda 100644
--- a/firstboot/userdata_example.yaml
+++ b/firstboot/userdata_example.yaml
@@ -42,10 +42,9 @@ resources:
str_replace:
template: |
#!/bin/bash
- curl http://169.254.169.254/openstack/2012-08-10/meta_data.json -o /root/meta_data.json
mkdir -p /home/$user/.ssh
chmod 700 /home/$user/.ssh
- cat /root/meta_data.json | jq -r ".keys[0].data" > /home/$user/.ssh/authorized_keys
+ os-apply-config --key public-keys.0.openssh-key --type raw > /home/$user/.ssh/authorized_keys
chmod 600 /home/$user/.ssh/authorized_keys
chown -R $user:$user /home/$user/.ssh
params: