diff --git a/docs/source/conf.py b/docs/source/conf.py index 96f53d5f..e1c77609 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = u'3.5' +version = u'3.6' # The full version, including alpha/beta/rc tags. -release = u'3.5.1.2' +release = u'3.6.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/patches/3.6.1.2/Dockerfile b/patches/3.6.1.2/Dockerfile new file mode 100644 index 00000000..be6ea2fe --- /dev/null +++ b/patches/3.6.1.2/Dockerfile @@ -0,0 +1,28 @@ +# Fixes to the default 3.6.1.2 reduced image. + +# Build on object-reduced image (GA release) +FROM emcvipr/object:3.6.1.2-127130.8f7f1a4b665-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 \ \ \ \ \ \ \ \ true' $f +RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $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 '' $f || sed -i 's###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 '10' $f || sed -i 's#80#10#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 diff --git a/patches/3.6.1.2/build.sh b/patches/3.6.1.2/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/patches/3.6.1.2/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +source image.conf + +docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.6.1.2/image.conf b/patches/3.6.1.2/image.conf new file mode 100644 index 00000000..5bf7caee --- /dev/null +++ b/patches/3.6.1.2/image.conf @@ -0,0 +1,3 @@ +BASE_IMAGE="emcvipr/object:3.6.1.2-127130.8f7f1a4b665-reduced" +IMAGE_REPO="emccorp/ecs-software-3.6.0" +IMAGE_VERSION="3.6.1.2" diff --git a/patches/3.6.2.0/Dockerfile b/patches/3.6.2.0/Dockerfile new file mode 100644 index 00000000..95b8b7d0 --- /dev/null +++ b/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 \ \ \ \ \ \ \ \ true' $f +RUN f=/opt/storageos/conf/vnest-common-conf.xml; sed -i '547 i \ \ \ \ \ \ \ \ true' $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 '' $f || sed -i 's###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 '10' $f || sed -i 's#80#10#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 diff --git a/patches/3.6.2.0/build.sh b/patches/3.6.2.0/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/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}" . diff --git a/patches/3.6.2.0/image.conf b/patches/3.6.2.0/image.conf new file mode 100644 index 00000000..8b879ca0 --- /dev/null +++ b/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" diff --git a/release.conf b/release.conf index 77f19df8..b43042a8 100644 --- a/release.conf +++ b/release.conf @@ -11,6 +11,16 @@ # DO NOT specify an alternate registry here. Use the -r argument to # bootstrap.sh for that. # +### 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" +# ### Older versions ( 3.5 ) # release_artifact="emccorp/ecs-software-3.5.0" # release_tag="3.5.1.2" diff --git a/ui/etc/config.yml b/ui/etc/config.yml index ef47ba96..ae6c6ab2 100644 --- a/ui/etc/config.yml +++ b/ui/etc/config.yml @@ -13,7 +13,7 @@ --- ui: name: ECS Community Edition Install Node - version: 2.11.0r + version: 2.9.1-r-2 host_root_dir: /opt/emc/ecs-install state_file: /opt/state.yml deploy_file: /opt/deploy.yml @@ -32,9 +32,9 @@ ui: ffx_sem: /opt/ffx.sem product: name: ECS - version: 3.5.1.2 + version: 3.6.2.0 vendor: Dell EMC flavor: Community Edition slogan: Free and Frictionless license_file: /usr/local/src/license.txt - common_name: "emccorp/ecs-software:latest" + common_name: "emccorp/ecs-software:3.6.0" diff --git a/ui/etc/release.conf b/ui/etc/release.conf index 21294836..4aac31f0 100644 --- a/ui/etc/release.conf +++ b/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.5.1.2" +release_version="3.6.2.0" release_product="ECS Software" -release_artifact="emccorp/ecs-software-3.5.0" -release_tag="3.5.1.2" +release_artifact="emccorp/ecs-software-3.6.0" +release_tag="3.6.2.0" release_common_name="emccorp/ecs-software:latest" docker_host_root="/opt/emc/ecs-install" @@ -31,8 +31,8 @@ repo_name='emccorp' image_name='ecs-install' tag='latest' ver_maj='2' -ver_min='11' -ver_rev='0' +ver_min='9' +ver_rev='1' ver_tag='r' serial=0 diff --git a/ui/setup.py b/ui/setup.py index 3dc23302..82718946 100755 --- a/ui/setup.py +++ b/ui/setup.py @@ -3,7 +3,7 @@ setup( name='ecsdeploy', - version='2.11.0r', + version='2.9.1r', packages=find_packages(), scripts=['ui.py', 'ecsdeploy.py',