From cb2f1e5346c5e616b4dfbf61af8dc27b3caebb57 Mon Sep 17 00:00:00 2001
From: Bryan Sullivan <bryan.sullivan@att.com>
Date: Thu, 1 Dec 2016 13:20:47 -0800
Subject: Embed public key in user data, various other updates

JIRA: MODELS-23

Add test duration and timestamps.
Add image and key cleanup to stop function.
Update Tacker Heat timeout config values.

Change-Id: I55da984477389d4eabb84abec522f58b3eed0032
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
---
 tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tests/blueprints/tosca-vnfd-hello-world-tacker')

diff --git a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
index 99b8d9d..bf570cc 100755
--- a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
+++ b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
@@ -12,7 +12,7 @@ topology_template:
       artifacts:
         VNFImage:
           type: tosca.artifacts.Deployment.Image.VM
-          file: http://artifacts.opnfv.org/models/images/xenial-server-cloudimg-amd64-disk1.img
+          file: http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
       capabilities:
         nfv_compute:
           properties:
@@ -29,6 +29,12 @@ topology_template:
         user_data: |
           #!/bin/bash
           set -x
+          mkdir /home/ubuntu
+          mkdir /home/ubuntu/.ssh
+          cat << EOM >/home/ubuntu/.ssh/authorized_keys
+          <pubkey>
+          EOM
+          chown -R ubuntu /home/ubuntu
           sudo mount /dev/sr0 /mnt/
           cd /tmp
           id=$(cut -d ',' -f 3 /mnt/openstack/latest/meta_data.json)
-- 
cgit