Configure docker0 bridge address

[apex-tripleo-heat-templates.git] / firstboot / userdata_example.yaml

diff --git a/firstboot/userdata_example.yaml b/firstboot/userdata_example.yaml
index a352093..32da7ed 100644 (file)
--- a/firstboot/userdata_example.yaml
+++ b/firstboot/userdata_example.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 # NOTE: You don't need to pass the parameter explicitly from the
 # parent template, it can be specified via the parameter_defaults
@@ -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: