commit c26b9cfd102dad0712a54d9cd0fc1d6ab79cb5ba
author Matteo Scandolo <teo@onlab.us> Fri Mar 04 14:56:02 2016 -0800
committer Matteo Scandolo <teo@onlab.us> Fri Mar 04 14:56:02 2016 -0800
tree b9384959833a2396a45aac27f71ab0e69c6870ba
parent 67caf75c9c4c030ba21834debe68324b3364ff67

Fixed tosca recipe

xos/tosca/MCORDServiceN.yaml

diff --git a/xos/tosca/MCORDServiceN.yaml b/xos/tosca/MCORDServiceN.yaml
index 25a9049..0229e43 100644
--- a/xos/tosca/MCORDServiceN.yaml
+++ b/xos/tosca/MCORDServiceN.yaml
@@ -35,35 +35,6 @@
               node: trusty-server-multi-nic

               relationship: tosca.relationships.SupportsImage

 

-    # CloudLab:

-    #   type: tosca.nodes.Controller

-    #   requirements:

-    #       - deployment:

-    #           node: MyDeployment

-    #           relationship: tosca.relationships.ControllerDeployment

-    #   properties:

-    #       backend_type: OpenStack

-    #       version: Juno

-    #       auth_url: http://sample/v2

-    #       admin_user: admin

-    #       admin_password: adminpassword

-    #       admin_tenant: admin

-    #       domain: Default

-

-    mysite:

-      type: tosca.nodes.Site

-      properties:

-          display_name: MySite

-          site_url: http://opencloud.us/

-      requirements:

-          - deployment:

-               node: MyDeployment

-               relationship: tosca.relationships.SiteDeployment

-               # requirements:

-               #     - controller:

-               #         node: CloudLab

-               #         relationship: tosca.relationships.UsesController

-

     compute9:

       type: tosca.nodes.Node

       requirements:

@@ -192,16 +163,13 @@
               node: mysite_mcord_slice1

               relationship: tosca.relationships.ConnectsToSlice

 

-    # mysite:

-    #   type: tosca.nodes.Site

+    mysite:

+      type: tosca.nodes.Site

 

 

     ubuntu-14.04-server-cloudimg-amd64-disk1:

       type: tosca.nodes.Image

 

-    # trusty-server-multi-nic:

-    #   type: tosca.nodes.Image

-

     mysite_mcord_slice1:

       description: MCORD Service Slice 1

       type: tosca.nodes.Slice