commit 156f04dedc4d19800fc46e3d965886fa64564e72
author Scott Baker <smbaker@gmail.com> Wed Sep 23 21:49:32 2015 -0700
committer Scott Baker <smbaker@gmail.com> Wed Sep 23 21:49:32 2015 -0700
tree 88c065b7fc287b363cb006b0dfee2919fedb946b
parent ff8845c849b58a0c93066624e4e3374fdc715c7a

add sample opencloud image, and link flavors to ViCCI deployment

xos/configurations/opencloud/opencloud.yaml

diff --git a/xos/configurations/opencloud/opencloud.yaml b/xos/configurations/opencloud/opencloud.yaml
index 59f81f7..b016ce7 100644
--- a/xos/configurations/opencloud/opencloud.yaml
+++ b/xos/configurations/opencloud/opencloud.yaml
@@ -8,8 +8,20 @@
 
 topology_template:
   node_templates:
+    Ubuntu 14.04 LTS:
+      type: tosca.nodes.Image
+      properties:
+         disk_format: raw
+         container_format: bare
+
     ViCCI:
       type: tosca.nodes.Deployment
+      properties:
+          flavors: m1.large, m1.medium, m1.small
+      requirements:
+          - image:
+              node: Ubuntu 14.04 LTS
+              relationship: tosca.relationships.SupportsImage
 
     princeton-vicci:
       type: tosca.nodes.Controller
@@ -29,7 +41,7 @@
       type: tosca.nodes.Site
       properties:
           display_name: US-Princeton     # this is Site.name
-          site_url: http://newsite.org/
+          site_url: http://cs.princeton.edu/
       requirements:
           - deployment:
                node: ViCCI