Merge branch 'master' into develop

EMCECS · Dec 18, 2015 · cfdd094 · cfdd094
2 parents 8b464e7 + c2ad52f
commit cfdd094
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/ecs-multi-node/gce/ecs_multi_node_template.jinja b/ecs-multi-node/gce/ecs_multi_node_template.jinja
@@ -8,7 +8,7 @@ resources:
   name: {{ DATADISK }}
   properties:
     zone: {{ properties["zone"] }}
-    sizeGb: 256
+    sizeGb: 100
     # Disk type is a full URI.  Example uses pd-standard, but pd-ssd can be used as well
     type: https://www.googleapis.com/compute/v1/projects/{{ env["project"] }}/zones/{{ properties["zone"] }}/diskTypes/pd-standard
 
@@ -49,7 +49,7 @@ resources:
           node4=$(iplookup ecs4)
           echo $node1 $node2 $node3 $node4
           python step1_ecs_multinode_install.py --ips $node1 $node2 $node3 $node4 --hostnames ecs1 ecs2 ecs3 ecs4 --disks sdb --ethadapter eth0
-          echo "Done!"
+          echo "Done! Try it out"
 
     disks:
     - deviceName: boot

diff --git a/ecs-single-node/gce/ecs_node_template.jinja b/ecs-single-node/gce/ecs_node_template.jinja
@@ -8,7 +8,7 @@ resources:
   name: {{ DATADISK }}
   properties:
     zone: {{ properties["zone"] }}
-    sizeGb: 256
+    sizeGb: 100
     # Disk type is a full URI.  Example uses pd-standard, but pd-ssd can be used as well
     type: https://www.googleapis.com/compute/v1/projects/{{ env["project"] }}/zones/{{ properties["zone"] }}/diskTypes/pd-standard
 
@@ -40,8 +40,8 @@ resources:
           echo "Starting ECS Install Script"
           python step1_ecs_singlenode_install.py --disks sdb --ethadapter eth0 --hostname ecs1
           echo "Upload License"
-          python step2_object_provisioning.py --ECSNodes=ecs1 --Namespace=ns1 --ObjectVArray=sp1 --ObjectVPool=rg1 --UserName=user1 --DataStoreName=ds1 --VDCName=vdc1 --MethodName=UploadLicense
-          echo "Done! Login and continue provisioning process"
+          python step2_object_provisioning.py --ECSNodes=ecs1 --Namespace=ns1 --ObjectVArray=sp1 --ObjectVPool=rg1 --UserName=user1 --DataStoreName=ds1 --VDCName=vdc1
+          echo "Done! Try it out"
     disks:
     - deviceName: boot
       type: PERSISTENT

diff --git a/ecs-single-node/gce/ecs_singlenode.yaml b/ecs-single-node/gce/ecs_singlenode.yaml
@@ -2,16 +2,15 @@ imports:
 - path: ecs_node_template.jinja
 
 resources:
+- name: ecs1
+  type: ecs_node_template.jinja
+  properties:
+    zone: us-central1-f
+
 - name: ecs-firewall
   type: compute.v1.firewall
   properties:
     allowed:
       - IPProtocol: TCP
         ports: [ 22,443,80,9024,9020,9011,4443 ]
-    sourceRanges: [ 0.0.0.0/0 ]
-
-- name: ecs1
-  type: ecs_node_template.jinja
-  properties:
-    zone: us-central1-f
-
+    sourceRanges: [ 0.0.0.0/0 ]