commit 56eb5deb6dba26a59c7f1e59e58b634815980320
author Pingping Lin <pingping@onlab.us> Thu Jun 09 18:54:04 2016 +0000
committer Pingping Lin <pingping@onlab.us> Thu Jun 09 18:54:04 2016 +0000
tree 93b056b3847127dc5b3feb71baa08417be050434
parent e48c1e091d305c173e694f2c8f265c1f0df555da
parent dadf682ea8397a2a690a58482bb8a5686380eefc

Merge branch 'master' of https://github.com/open-cloud/xos into open-cloud-master

Conflicts:
	xos/configurations/mcord/nodes.yaml

xos/configurations/mcord/nodes.yaml

diff --git a/xos/configurations/mcord/nodes.yaml b/xos/configurations/mcord/nodes.yaml
index 91bdf21..48e7247 100644
--- a/xos/configurations/mcord/nodes.yaml
+++ b/xos/configurations/mcord/nodes.yaml
@@ -22,6 +22,16 @@
               node: MyDeployment
               relationship: tosca.relationships.MemberOfDeployment
 
+    nova-compute:
+      type: tosca.nodes.Node
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.MemberOfSite
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.MemberOfDeployment
+
     compute10:
         type: tosca.nodes.Node
         requirements: