Merge branch 'develop' of https://github.com/EMCECS/ECS-CommunityEdition

 into develop

Documentation/ECS-UI-Web-Interface.md

@@ -8,7 +8,7 @@ You cannot add, change, or remove administrative users in this build. Use the de
 > Username: **root**<br/>Password: **ChangeMe**
 
 ## Input License
-Open *Settings*, then *Licensing* and upload the `license.txt` file located in the root of this repo. **The UI will not automatically update the license view in this release.** Navigating away from page and returning will prompt it to update. You may need to try a few times before it updates. Once it does, you should see something like this:
+Open *Settings*, then *Licensing* and upload the `license.xml` file located in the ecs-single-node / ecs-multi-node folder. **The UI will not automatically update the license view in this release.** Navigating away from page and returning will prompt it to update. You may need to try a few times before it updates. Once it does, you should see something like this:
 
 ![Upload License file](https://github.com/EMCECS/ECS-CommunityEdition/blob/master/Documentation/media/input_license.PNG)
 

ecs-multi-node/additional_prep.sh

@@ -36,7 +36,7 @@ fi
 num_files=`$DF -BG $mount_point | $GREP $mount_point | $AWK -v FGB=$FILE_SIZE_GB '{gsub("G", "", $4); print int($4 / FGB)}'`
 
 # Remove one block so we can account for XFS reserved space.
-$((num_files--))
+((num_files--))
 declare -a inodes
 for ((i=0;i<$num_files;i++)) {
     file=`printf "%04d\n" $i`
@@ -74,4 +74,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # mount again, the file system is now ready
-$MOUNT $device $mount_point -o noatime
+$MOUNT $device $mount_point -o rw,noatime,seclabel,attr2,inode64,noquota
+
+# Add the filesystem to /etc/fstab
+grep "$device" /etc/fstab || echo "$MOUNT $device $mount_point -o rw,noatime,seclabel,attr2,inode64,noquota 0 0" >> /etc/fstab

ecs-multi-node/step1_ecs_multinode_install.py

@@ -46,6 +46,7 @@ def package_install_func():
         yum_package_wget = "wget"
         yum_package_tar = "tar"
         yum_package_docker = "docker"
+        yum_package_xfsprogs = "xfsprogs"
         yum_auto_install = "-y"
 
         logger.info("Performing installation of the following package: {} .".format(yum_package_wget))
@@ -54,6 +55,9 @@ def package_install_func():
         logger.info("Performing installation of the following package: {} .".format(yum_package_tar))
         subprocess.call([yum, yum_arg, yum_package_tar, yum_auto_install])
 
+        logger.info("Performing installation of the following package: {} .".format(yum_package_xfsprogs))
+        subprocess.call([yum, yum_arg, yum_package_xfsprogs, yum_auto_install])
+
         logger.info("Performing installation of the following package: {} .".format(yum_package_docker))
         subprocess.call([yum, yum_arg, yum_package_docker, yum_auto_install])
 
@@ -268,7 +272,7 @@ def prepare_data_disk_func(disks):
                 logger.info("Data disk already entered in fs table")
             elif p.returncode == 1:
                 with open("/etc/fstab", 'a') as file:
-                    file.write("{} {} xfs rw,noatime,seclabel,attr2,inode64, noquota 0 0".format(device_name, uuid_name) )
+                    file.write("{} /ecs/{} xfs rw,noatime,seclabel,attr2,inode64,noquota 0 0".format(device_name, uuid_name) )
             else:
                 logger.info("Error in checking filesystem table: {}".format(err))
 
@@ -541,7 +545,8 @@ def modify_container_conf_func():
         logger.info("Adding python requests library to container")
         os.system(
             "docker "+' '.join(DockerCommandLineFlags)+" exec -t  ecsmultinode curl -OL https://github.com/kennethreitz/requests/tarball/master")
-        os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t  ecsmultinode tar zxvf master -C /tmp")        os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t -i ecsstandalone bash -c \"cd /tmp/kennethreitz-requests-* && python setup.py install\"")
+        os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t  ecsmultinode tar zxvf master -C /tmp")
+        os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t -i ecsstandalone bash -c \"cd /tmp/kennethreitz-requests-* && python setup.py install\"")
         os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t  ecsmultinode wget https://bootstrap.pypa.io/ez_setup.py")
         logger.info("Cleaning up python packages")
         os.system("docker "+' '.join(DockerCommandLineFlags)+" exec -t  ecsmultinode rm master")

ecs-single-node/additional_prep.sh

@@ -36,7 +36,7 @@ fi
 num_files=`$DF -BG $mount_point | $GREP $mount_point | $AWK -v FGB=$FILE_SIZE_GB '{gsub("G", "", $4); print int($4 / FGB)}'`
 
 # Remove one block so we can account for XFS reserved space.
-$((num_files--))
+((num_files--))
 declare -a inodes
 for ((i=0;i<$num_files;i++)) {
     file=`printf "%04d\n" $i`
@@ -74,4 +74,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # mount again, the file system is now ready
-$MOUNT $device $mount_point -o noatime
+$MOUNT $device $mount_point -o rw,noatime,seclabel,attr2,inode64,noquota
+
+# Add the filesystem to /etc/fstab
+grep "$device" /etc/fstab || echo "$MOUNT $device $mount_point -o rw,noatime,seclabel,attr2,inode64,noquota 0 0" >> /etc/fstab

ecs-single-node/step1_ecs_singlenode_install.py

@@ -52,6 +52,7 @@ def package_install_func():
         yum_package_wget = "wget"
         yum_package_tar = "tar"
         yum_package_docker = "docker"
+        yum_package_xfsprogs = "xfsprogs"
         yum_auto_install = "-y"
 
         logger.info("Performing installation of the following package: {} .".format(yum_package_wget))
@@ -60,7 +61,10 @@ def package_install_func():
         logger.info("Performing installation of the following package: {} .".format(yum_package_tar))
         subprocess.call([yum, yum_arg, yum_package_tar, yum_auto_install])
 
-        logger.info("Performing installation of the following package: {}.".format(yum_package_docker))
+        logger.info("Performing installation of the following package: {} .".format(yum_package_xfsprogs))
+        subprocess.call([yum, yum_arg, yum_package_xfsprogs, yum_auto_install])
+
+        logger.info("Performing installation of the following package: {} .".format(yum_package_docker))
         subprocess.call([yum, yum_arg, yum_package_docker, yum_auto_install])
 
     except Exception as ex:
@@ -280,7 +284,7 @@ def prepare_data_disk_func(disks):
                 logger.info("Data disk already entered in fs table")
             elif p.returncode == 1:
                 with open("/etc/fstab", 'a') as file:
-                    file.write("{} {} xfs rw,noatime,seclabel,attr2,inode64, noquota 0 0".format(device_name, uuid_name) )
+                    file.write("{} /ecs/{} xfs rw,noatime,seclabel,attr2,inode64,noquota 0 0".format(device_name, uuid_name) )
             else:
                 logger.info("Error in checking filesystem table: {}".format(err))
 

licence.txt → license.txt

@@ -38,4 +38,4 @@ EMC and Customer enter into this Agreement and this Agreement shall become effec
 
 9.0 GENERAL
 
-9.1 - Assignment – Customer shall not assign any right or interest hereunder nor delegate any work or other obligation to be performed hereunder to any entity other than its corporate parent, or a division or wholly or majority owned subsidiary of the party or its corporate parent. Any such action in violation of the foregoing shall be void. 9.2 -Entire Agreement - The terms contained herein constitute the entire agreement between the parties with respect to the subject matter hereof and shall supersede all prior communications and agreements, either oral, written or otherwise recorded. 9.3 - Compliance with Export Control Laws – Customer shall comply with all applicable export laws, orders and regulations and obtain all necessary governmental permits, licenses and clearances. 9.4 - Governing Law - This Agreement shall be governed by the laws of the Commonwealth of Massachusetts, excluding its conflict of law rules. The U. N. Convention on Contracts for the International Sale of Goods shall not apply. 9.5 - Notices – Except for routine communications, all other notices required or permitted hereunder, including but not limited to notices of default or breach, shall be signed by an authorized representative of the sender. Such notices shall be deemed to have been received (i) when hand delivered to such individuals by a representative of the sender; (ii) three (3) days after having been sent postage prepaid, by registered or certified first class mail, return receipt requested; (iii) when sent by electronic transmission, with written confirmation by the method of transmission; or (iv) one (1) day after deposit with an overnight carrier, with written verification of delivery. 9.6 - No Waiver – No omission or delay by either party in requiring the other party to fulfill its obligations hereunder shall be deemed to constitute a waiver of (i) the right to require the fulfillment of any other obligation hereunder; or (ii) any remedy that may be available hereunder. 9.7 - Independent Contractors - The parties shall act as independent contractors for all purposes under this Agreement. Nothing contained herein shall be deemed to constitute either party as an agent or representative of the other party, or both parties as joint venturers or partners for any purpose. Neither party shall be responsible for the acts or omissions of the other party, and neither party will have authority to speak for, represent or obligate the other party in any way without an authenticated record indicating the prior approval of the other party. 9.8 - Separability - If any provision of this Agreement shall be held illegal or unenforceable, such provision shall be deemed separable from, and shall in no way affect or impair the validity or enforceability of, the remaining provisions.
+9.1 - Assignment – Customer shall not assign any right or interest hereunder nor delegate any work or other obligation to be performed hereunder to any entity other than its corporate parent, or a division or wholly or majority owned subsidiary of the party or its corporate parent. Any such action in violation of the foregoing shall be void. 9.2 -Entire Agreement - The terms contained herein constitute the entire agreement between the parties with respect to the subject matter hereof and shall supersede all prior communications and agreements, either oral, written or otherwise recorded. 9.3 - Compliance with Export Control Laws – Customer shall comply with all applicable export laws, orders and regulations and obtain all necessary governmental permits, licenses and clearances. 9.4 - Governing Law - This Agreement shall be governed by the laws of the Commonwealth of Massachusetts, excluding its conflict of law rules. The U. N. Convention on Contracts for the International Sale of Goods shall not apply. 9.5 - Notices – Except for routine communications, all other notices required or permitted hereunder, including but not limited to notices of default or breach, shall be signed by an authorized representative of the sender. Such notices shall be deemed to have been received (i) when hand delivered to such individuals by a representative of the sender; (ii) three (3) days after having been sent postage prepaid, by registered or certified first class mail, return receipt requested; (iii) when sent by electronic transmission, with written confirmation by the method of transmission; or (iv) one (1) day after deposit with an overnight carrier, with written verification of delivery. 9.6 - No Waiver – No omission or delay by either party in requiring the other party to fulfill its obligations hereunder shall be deemed to constitute a waiver of (i) the right to require the fulfillment of any other obligation hereunder; or (ii) any remedy that may be available hereunder. 9.7 - Independent Contractors - The parties shall act as independent contractors for all purposes under this Agreement. Nothing contained herein shall be deemed to constitute either party as an agent or representative of the other party, or both parties as joint venturers or partners for any purpose. Neither party shall be responsible for the acts or omissions of the other party, and neither party will have authority to speak for, represent or obligate the other party in any way without an authenticated record indicating the prior approval of the other party. 9.8 - Separability - If any provision of this Agreement shall be held illegal or unenforceable, such provision shall be deemed separable from, and shall in no way affect or impair the validity or enforceability of, the remaining provisions.