diff --git a/README.md b/README.md index 39de480..4a047cd 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ need further instructions about how to build the Fuel Plugin Builder.* ``` $ git clone https://github.com/openstack/fuel-plugin-scaleio.git $ cd fuel-plugin-scaleio - $ git checkout "tags/v2.1.1" + $ git checkout "tags/v2.1.3" ``` 5. Check that the plugin is valid: @@ -91,7 +91,7 @@ need further instructions about how to build the Fuel Plugin Builder.* 7. Install plugin: ``` - $ fuel plugins --install ./scaleio-2.1-2.1.1-1.noarch.rpm + $ fuel plugins --install ./scaleio-2.1-2.1.3-1.noarch.rpm ``` ## ScaleIO Plugin install from Fuel Plugins Catalog @@ -102,12 +102,12 @@ To install the ScaleIOv2.0 Fuel plugin: 2. Copy the rpm file to the Fuel Master node ``` - [root@home ~]# scp scaleio-2.1-2.1.1-1.noarch.rpm root@fuel-master:/tmp + [root@home ~]# scp scaleio-2.1-2.1.3-1.noarch.rpm root@fuel-master:/tmp ``` 3. Log into Fuel Master node and install the plugin using the Fuel CLI ``` - $ fuel plugins --install ./scaleio-2.1-2.1.1-1.noarch.rpm + $ fuel plugins --install ./scaleio-2.1-2.1.3-1.noarch.rpm ``` 4. Verify that the plugin is installed correctly @@ -115,7 +115,7 @@ To install the ScaleIOv2.0 Fuel plugin: [root@fuel-master ~]# fuel plugins id | name | version | package_version ---|-----------------------|---------|---------------- - 1 | scaleio | 2.1.1 | 3.0.0 + 1 | scaleio | 2.1.3 | 3.0.0 ``` # User Guide diff --git a/doc/source/conf.py b/doc/source/conf.py index 0f635d2..0d79374 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -11,8 +11,8 @@ master_doc = 'index' project = u'The ScaleIO plugin for Fuel' copyright = u'2016, EMC Corporation' -version = '2.1-2.1.2-1' -release = '2.1-2.1.2-1' +version = '2.1-2.1.3-1' +release = '2.1-2.1.3-1' exclude_patterns = [] diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 8227a03..ee55a9f 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -13,7 +13,7 @@ To install the ScaleIOv2.0 Fuel plugin: #. Copy the *rpm* file to the Fuel Master node: :: - [root@home ~]# scp scaleio-2.1-2.1.1-1.noarch.rpm + [root@home ~]# scp scaleio-2.1-2.1.3-1.noarch.rpm root@fuel-master:/tmp #. Log into Fuel Master node and install the plugin using the @@ -21,14 +21,14 @@ To install the ScaleIOv2.0 Fuel plugin: :: [root@fuel-master ~]# fuel plugins --install - /tmp/scaleio-2.1-2.1.1-1.noarch.rpm + /tmp/scaleio-2.1-2.1.3-1.noarch.rpm #. Verify that the plugin is installed correctly: :: [root@fuel-master ~]# fuel plugins id | name | version | package_version ---|-----------------------|---------|---------------- - 1 | scaleio | 2.1.1 | 3.0.0 + 1 | scaleio | 2.1.3 | 3.0.0 .. _Fuel Plugins Catalog: https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/ diff --git a/doc/source/release_notes.rst b/doc/source/release_notes.rst index a688006..f8939b5 100644 --- a/doc/source/release_notes.rst +++ b/doc/source/release_notes.rst @@ -1,3 +1,13 @@ +Release Notes v2.1.3 +==================== + + +New Features +---------------- + +1. Use FTP server to download ScaleIO packages. Added appropriate option into the plugin settings to enable ability to use own FTP. + + Release Notes v2.1.2 ==================== diff --git a/doc/testing/TestPlanforScaleIOFuelPlugin.docx b/doc/testing/TestPlanforScaleIOFuelPlugin.docx index 87b17ba..4a21c04 100644 Binary files a/doc/testing/TestPlanforScaleIOFuelPlugin.docx and b/doc/testing/TestPlanforScaleIOFuelPlugin.docx differ diff --git a/doc/testing/TestPlanforScaleIOFuelPlugin.pages b/doc/testing/TestPlanforScaleIOFuelPlugin.pages index dc5ab57..5e7cf09 100644 Binary files a/doc/testing/TestPlanforScaleIOFuelPlugin.pages and b/doc/testing/TestPlanforScaleIOFuelPlugin.pages differ diff --git a/doc/testing/TestReportScaleIOFuelPlugin.docx b/doc/testing/TestReportScaleIOFuelPlugin.docx index 7227cbc..9846f0d 100644 Binary files a/doc/testing/TestReportScaleIOFuelPlugin.docx and b/doc/testing/TestReportScaleIOFuelPlugin.docx differ diff --git a/doc/testing/TestReportScaleIOFuelPlugin.pages b/doc/testing/TestReportScaleIOFuelPlugin.pages index 868e45b..62bc131 100644 Binary files a/doc/testing/TestReportScaleIOFuelPlugin.pages and b/doc/testing/TestReportScaleIOFuelPlugin.pages differ diff --git a/metadata.yaml b/metadata.yaml index 1d0472c..2abaf8a 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -5,7 +5,7 @@ name: scaleio title: ScaleIOv2.0 plugin # Plugin version -version: '2.1.2' +version: '2.1.3' # Description description: This plugin deploys and enables EMC ScaleIO ver. 2.0 as the block storage backend diff --git a/pre_build_hook b/pre_build_hook index 444a175..dc8acf5 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -11,7 +11,7 @@ set -eux -RELEASE=${RELEASE_TAG:-"v1.1.4"} +RELEASE=${RELEASE_TAG:-"v1.2.0"} BASE_PUPPET_URL="https://github.com/codedellemc"