3.6.2 branch changes

docs/source/conf.py

@@ -56,7 +56,7 @@
 # The short X.Y version.
 version = u'3.6'
 # The full version, including alpha/beta/rc tags.
-release = u'3.6.1.2'
+release = u'3.6.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

patches/3.6.2.0/Dockerfile

@@ -0,0 +1,28 @@
+# Fixes to the default 3.6.2.0 reduced image.
+
+# Build on object-reduced image (GA release)
+FROM emcvipr/object:3.6.2.0-127497.982f3bd4450-reduced
+
+# Fix disk partitioning script
+RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \
+    && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh
+
+# Set VNest useSeperateThreadPools to True
+#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ <prop key="object.UseSeparateThreadPools">true</prop>' $f
+RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ <prop key="object.UseSeparateThreadPools">true</prop>' $f
+
+# Allow allocation of different blocks of a chunk to be stored on the same partition
+#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '<config:boolean name="allowAllocationOnIgnoredPartitions" value="true" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>' $f || sed -i 's#<config:boolean name="allowAllocationOnIgnoredPartitions" value="false" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>#<config:boolean name="allowAllocationOnIgnoredPartitions" value="true" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>#g' /opt/storageos/conf/ssm-cf-conf.xml $f
+
+## Increase memory for transformsvc
+#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc
+
+## Set memory for objcontrolsvc
+#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc
+
+# Set georeceiver's initialBufferNumOnHeap to something smaller for CE
+#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f ||  sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f
+#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '<prop key="object.InitialBufferNumOnHeap">10</prop>' $f || sed -i 's#<prop key="object.InitialBufferNumOnHeap">80</prop>#<prop key="object.InitialBufferNumOnHeap">10</prop>#g' $f
+
+# Configure CM Object properties: Disable minimum storage device count
+#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f ||  sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f

patches/3.6.2.0/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+source image.conf
+
+docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" .

patches/3.6.2.0/image.conf

@@ -0,0 +1,3 @@
+BASE_IMAGE="emcvipr/object:3.6.2.0-127497.982f3bd4450-reduced"
+IMAGE_REPO="emccorp/ecs-software-3.6.0"
+IMAGE_VERSION="3.6.2.0"

release.conf

@@ -13,6 +13,11 @@
 #
 ### Older versions ( 3.6 )
 # release_artifact="emccorp/ecs-software-3.6.0"
+# release_tag="3.6.2.0"
+# release_tag="3.6.2.0"
+#
+### Older versions ( 3.6 )
+# release_artifact="emccorp/ecs-software-3.6.0"
 # release_tag="3.6.1.2"
 # release_tag="3.6.1.2"
 #

ui/etc/config.yml

@@ -32,7 +32,7 @@ ui:
   ffx_sem: /opt/ffx.sem
 product:
   name: ECS
-  version: 3.6.1.2
+  version: 3.6.2.0
   vendor: Dell EMC
   flavor: Community Edition
   slogan: Free and Frictionless

ui/etc/release.conf

@@ -8,10 +8,10 @@
 # it is provided by or on behalf of EMC.
 
 release_name="ECS Community Edition"
-release_version="3.6.1.2"
+release_version="3.6.2.0"
 release_product="ECS Software"
 release_artifact="emccorp/ecs-software-3.6.0"
-release_tag="3.6.1.2"
+release_tag="3.6.2.0"
 release_common_name="emccorp/ecs-software:latest"
 
 docker_host_root="/opt/emc/ecs-install"

ui/run.sh

@@ -118,11 +118,10 @@ case "$(basename ${0})" in
         run ecsdeploy check || exit $?
         run ecsdeploy bootstrap || exit $?
         run ecsdeploy reboot || exit $?
-        sleep 30
+        sleep 10
         run ping_until_clear
         run ecsdeploy deploy || exit $?
         run ecsdeploy start || exit $?
-	o "Please wait for 30 minutes before running next step for services to bootstrap"
     ;;
     ova-step1)
         #run ecsdeploy load || exit $?
@@ -131,7 +130,6 @@ case "$(basename ${0})" in
         run ecsdeploy bootstrap || exit $?
         run ecsdeploy deploy || exit $?
         run ecsdeploy start || exit $?
-	o "Please wait for 30 minutes before running next step for services to bootstrap"
     ;;
     step1)
         #run ecsdeploy load || exit $?
@@ -143,7 +141,6 @@ case "$(basename ${0})" in
         run ping_until_clear
         run ecsdeploy deploy || exit $?
         run ecsdeploy start || exit $?
-	o "Please wait for 30 minutes before running next step for services to bootstrap"
     ;;
     step2|island-step3|ova-step2)
         o "Pinging Management API Endpoint until ready"
@@ -152,8 +149,6 @@ case "$(basename ${0})" in
         o "Pinging Management API Endpoint until ready"
         run ecsconfig ping -c -x || exit $?
         run ecsconfig sp -a || exit $?
-	o "Sleeping for 15 minutes for Storage Pool to be ready"
-        sleep 900
         o "Pinging Management API Endpoint until ready"
         run ecsconfig ping -c -x || exit $?
         run ecsconfig vdc -a || exit $?