commit 07cb966d835ebdfbe97c5b66995d62c0038a68e7
author Pingping Lin <pingping@onlab.us> Wed Jan 25 18:29:09 2017 -0800
committer Pingping Lin <pingping@onlab.us> Wed Jan 25 18:29:09 2017 -0800
tree 16023c0c522787d138196c5135f260b23e468788
parent 3be0aa17379cbf847303a89a885c4e874e83b400

make the cloudlab and real rack use a same deployment.yaml

Change-Id: If9a4b84674eb3e886917b4d362ea165e05186049

mcord/deployment.yaml

diff --git a/mcord/deployment.yaml b/mcord/deployment.yaml
index 2adfdff..5ae7fbd 100644
--- a/mcord/deployment.yaml
+++ b/mcord/deployment.yaml
@@ -1,13 +1,15 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
-description: Some basic fixtures
-
 imports:
    - custom_types/xos.yaml
 
+description: deployment config, generated by platform-install
+
 topology_template:
   node_templates:
 
+# Flavors
+
     m1.small:
       type: tosca.nodes.Flavor
 
@@ -20,32 +22,41 @@
     m1.xlarge:
       type: tosca.nodes.Flavor
 
+
+# Deployment
     MyDeployment:
       type: tosca.nodes.Deployment
       requirements:
           - m1.small:
-             node: m1.small
-             relationship: tosca.relationships.SupportsFlavor
-          - m1.medium:
-             node: m1.medium
-             relationship: tosca.relationships.SupportsFlavor
-          - m1.large:
-             node: m1.large
-             relationship: tosca.relationships.SupportsFlavor
-          - m1.xlarge:
-             node: m1.xlarge
-             relationship: tosca.relationships.SupportsFlavor
+              node: m1.small
+              relationship: tosca.relationships.SupportsFlavor
 
+          - m1.medium:
+              node: m1.medium
+              relationship: tosca.relationships.SupportsFlavor
+
+          - m1.large:
+              node: m1.large
+              relationship: tosca.relationships.SupportsFlavor
+
+          - m1.xlarge:
+              node: m1.xlarge
+              relationship: tosca.relationships.SupportsFlavor
+
+
+# Site
     mysite:
       type: tosca.nodes.Site
       properties:
           display_name: MySite
+          site_url: http://mysite.opencloud.us/
+          hosts_nodes: true
       requirements:
-          - deployment:
-               node: MyDeployment
-               relationship: tosca.relationships.MemberOfDeployment
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.MemberOfDeployment
 
-    # Attach the Tenant view to the MyDeployment deployment
+# Attach the Tenant view to the deployment
     Tenant:
       type: tosca.nodes.DashboardView
       properties:
@@ -56,21 +67,19 @@
               node: MyDeployment
               relationship: tosca.relationships.SupportsDeployment
 
+# XOS Users
     padmin@vicci.org:
       type: tosca.nodes.User
       properties:
-          password: letmein
-#          encrypted_password: pbkdf2_sha256$12000$Qufx9iqtaYma$xs0YurPOcj9qYQna/Qrb3K+im9Yr2XEVr0J4Kqek7AE=
-          firstname: XOS
-          lastname: admin
-          is_admin: true
+        password: letmein
+        firstname: PAdmin
+        lastname: VicciOrg
+        is_admin: True
       requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.MemberOfSite
-          - tenant_dashboard:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.MemberOfSite
+        - tenant_dashboard:
               node: Tenant
               relationship: tosca.relationships.UsesDashboard
 
-
-