From 9e549c52dfb2ec31e430b530856c8f27180370d8 Mon Sep 17 00:00:00 2001 From: Hassan Date: Tue, 22 Sep 2015 09:45:07 -0700 Subject: [PATCH 1/6] Revert "Updating GCE Template - provisioning steps and disk size" This reverts commit 82e3fc35d34db7ff90d91542a818a8b0f7357d7b. --- ecs-multi-node/gce/ecs_multi_node_template.jinja | 4 ++-- ecs-single-node/gce/ecs_node_template.jinja | 6 +++--- ecs-single-node/gce/ecs_singlenode.yaml | 13 ++++++------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ecs-multi-node/gce/ecs_multi_node_template.jinja b/ecs-multi-node/gce/ecs_multi_node_template.jinja index e729ae87..f6944c26 100644 --- 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 index 4c1e5ade..f3652e08 100644 --- 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 index 982c9e6d..884efd83 100644 --- 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 ] \ No newline at end of file From e34251927ced35b32600402301d682b596ae420e Mon Sep 17 00:00:00 2001 From: petera5 Date: Tue, 24 Nov 2015 15:28:42 -0600 Subject: [PATCH 2/6] Fixed ordering in single-node step1 causing issue #52. --- ecs-single-node/step1_ecs_singlenode_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs-single-node/step1_ecs_singlenode_install.py b/ecs-single-node/step1_ecs_singlenode_install.py index ceccbc76..0a71daf9 100644 --- a/ecs-single-node/step1_ecs_singlenode_install.py +++ b/ecs-single-node/step1_ecs_singlenode_install.py @@ -684,15 +684,15 @@ def main(): # Step 1 : Configuration of Host Machine to run the ECS Docker Container - logger.info("Starting Step 1: Configuration of Host Machine to run the ECS Docker Container: {}".format(docker_image_name)) - docker_image_name = "{}:{}".format(args.imagename, args.imagetag) + ethernet_adapter_name = get_first(args.ethadapter) # Get the IP address on Linux s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) ip_address = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ethernet_adapter_name[:15]))[20:24]) + logger.info("Starting Step 1: Configuration of Host Machine to run the ECS Docker Container: {}".format(docker_image_name)) yum_func() package_install_func() From 5899c461610029df48fa0bff74ae5a151b40d4ce Mon Sep 17 00:00:00 2001 From: petera5 Date: Tue, 24 Nov 2015 15:29:48 -0600 Subject: [PATCH 3/6] Fixed inaccurate `-help` message in multi-node step1 --- ecs-multi-node/step1_ecs_multinode_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs-multi-node/step1_ecs_multinode_install.py b/ecs-multi-node/step1_ecs_multinode_install.py index 41f3c94c..308b98f3 100644 --- a/ecs-multi-node/step1_ecs_multinode_install.py +++ b/ecs-multi-node/step1_ecs_multinode_install.py @@ -575,7 +575,7 @@ def main(): help='If present, run the Docker container/images Clean up and the /data Folder. Example: True/False', required=False) parser.add_argument('--imagename', dest='imagename', - help='If present, pulls a specific image from DockerHub. Defaults to emccorp/ecs-reduced-footprint', + help='If present, pulls a specific image from DockerHub. Defaults to emccorp/ecs-software', required=False) parser.add_argument('--imagetag', dest='imagetag', help='If present, pulls a specific version of the target image from DockerHub. Defaults to latest', From a1f98b2254d8f003b5f4c3033fab3fe5345f0400 Mon Sep 17 00:00:00 2001 From: petera5 Date: Mon, 30 Nov 2015 17:03:10 -0600 Subject: [PATCH 4/6] Made note of recommended installation. --- README.md | 2 +- ecs-multi-node/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5d51cd2d..9c23d056 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ There are two deployment options available: -- **[ECS Docker Multiple Node Deployment](https://github.com/EMCECS/ECS-CommunityEdition/tree/master/ecs-multi-node "ECS Multiple Node Deployment Information")** +- **[ECS Docker Multiple Node Deployment (recommended)](https://github.com/EMCECS/ECS-CommunityEdition/tree/master/ecs-multi-node "ECS Multiple Node Deployment Information")** - **[ECS Docker Single Node Deployment](https://github.com/EMCECS/ECS-CommunityEdition/tree/master/ecs-single-node "ECS Single Node Deployment Information")** ## Description diff --git a/ecs-multi-node/README.md b/ecs-multi-node/README.md index 79212655..c576ac18 100644 --- a/ecs-multi-node/README.md +++ b/ecs-multi-node/README.md @@ -13,8 +13,8 @@ Welcome to the Multiple Nodes installation for ECS Software 2.0. We have provide The Host Machines should have these following minimum requirements: - **Operative system:** CentOS 7 -- **CPU/Cores:** 4 Cores -- **Memory:** Minimum of 50 GB RAM (64 GB recommended) +- **CPU/Cores:** 3 Cores +- **Memory:** Minimum of 16 GB RAM - **Disks:** An unpartitioned/Raw disk with at least 100 GB of Storage per disk per host. Multiple disks can be attached on each ECS Node to increase capacity and performance. Each disk need to be un-partitioned before running the installation scripts. We have performed testing against the following platform(s): From 6816f7335bd9483a02ac08bf32a1cd8b28b66d4e Mon Sep 17 00:00:00 2001 From: petera5 Date: Mon, 30 Nov 2015 16:58:38 -0600 Subject: [PATCH 5/6] Updated README for recent pull request (#51). --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c23d056..e1a74731 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # ECS 2.0 Software Container Deployment -**Update July-28-2015:** Updated Docker Image to a Reduced Memory Footprint (16 GB RAM) +**Update November-30-2015:** Updated Docker Image to a [ECS Software v2.1 Hotfix 1](https://support.emc.com/docu62132_ECS_2.1_HF1_Readme.txt?language=en_US&language=en_US) +- Users can now optionally specify docker image via command-line arguments in step1. +- Installation script provides more inforamation to user, proceeds depending on services' availability. +- Fix for authentication issues resulting from default provisioning. There are two deployment options available: From c2ad52f9073da334a0f6eb03348c50d7e7b23dab Mon Sep 17 00:00:00 2001 From: Jason Cwik Date: Thu, 17 Dec 2015 12:51:40 -0600 Subject: [PATCH 6/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e1a74731..4b326421 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # ECS 2.0 Software Container Deployment +** NOTE 2015-12-17: We are currently aware of an issue (#59) causing image pulls to fail and are working on a fix ** + **Update November-30-2015:** Updated Docker Image to a [ECS Software v2.1 Hotfix 1](https://support.emc.com/docu62132_ECS_2.1_HF1_Readme.txt?language=en_US&language=en_US) - Users can now optionally specify docker image via command-line arguments in step1. - Installation script provides more inforamation to user, proceeds depending on services' availability.