summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/conf.py4
-rw-r--r--doc/source/installation.rst12
-rw-r--r--doc/source/intro.rst2
-rw-r--r--doc/source/limitations.rst2
-rw-r--r--doc/source/release-notes.rst6
-rw-r--r--doc/source/removal.rst4
-rw-r--r--doc/source/verification.rst2
-rw-r--r--doc/source/zabbix-versions.rst5
8 files changed, 17 insertions, 20 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0ba23cb..66e1f2d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -7,8 +7,8 @@ master_doc = 'index'
7project = u'EMC VNX plugin for Fuel' 7project = u'EMC VNX plugin for Fuel'
8copyright = u'2016, Mirantis Inc.' 8copyright = u'2016, Mirantis Inc.'
9 9
10version = '3.0' 10version = '4.0'
11release = '3.0-3.0.0-1' 11release = '4.0-4.0.0-1'
12 12
13pygments_style = 'sphinx' 13pygments_style = 'sphinx'
14 14
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index d64441b..13f12d7 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -12,7 +12,7 @@ The EMC VNX plugin for Fuel has the following requirements:
12 * - Requirement 12 * - Requirement
13 - Version 13 - Version
14 * - Fuel 14 * - Fuel
15 - 8.0 15 - 9.0
16 * - EMC VNX array 16 * - EMC VNX array
17 - VNX Operational Environment for Block 5.32 or higher 17 - VNX Operational Environment for Block 5.32 or higher
18 18
@@ -28,8 +28,8 @@ Prerequisites
28Before you install and start using the Fuel EMC VNX plugin, complete the 28Before you install and start using the Fuel EMC VNX plugin, complete the
29following steps: 29following steps:
30 30
31#. Install and set up `Fuel 8.0 for Liberty <https://www.mirantis.com/software/mirantis-openstack/releases/>`_. 31#. Install and set up `Fuel 9.0 for Mitaka <https://www.mirantis.com/software/mirantis-openstack/releases/>`_.
32 For details, see `Fuel Installation Guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/fuel-install-guide.html>`_. 32 For details, see `Fuel Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide.html>`_.
33#. Activate the VNX Snapshot and Thin Provisioning license. 33#. Activate the VNX Snapshot and Thin Provisioning license.
34#. Configure and deploy the EMC VNX array. 34#. Configure and deploy the EMC VNX array.
35#. Verify that the EMC VNX array is reachable through one of the Mirantis 35#. Verify that the EMC VNX array is reachable through one of the Mirantis
@@ -78,7 +78,7 @@ To install the Fuel EMC VNX plugin:
78 78
79 .. code-block:: console 79 .. code-block:: console
80 80
81 # scp emc_vnx-3.0-3.0.0-1.noarch.rpm root@<FUEL_MASTER_NODE_IP>:/tmp 81 # scp emc_vnx-4.0-4.0.0-1.noarch.rpm root@<FUEL_MASTER_NODE_IP>:/tmp
82 82
83#. Log into the Fuel Master node CLI as root. 83#. Log into the Fuel Master node CLI as root.
84 84
@@ -87,7 +87,7 @@ To install the Fuel EMC VNX plugin:
87 .. code-block:: console 87 .. code-block:: console
88 88
89 # cd /tmp 89 # cd /tmp
90 # fuel plugins --install emc_vnx-3.0-3.0.0-1.noarch.rpm 90 # fuel plugins --install emc_vnx-4.0-4.0.0-1.noarch.rpm
91 91
92#. Verify that the plugin was installed successfully: 92#. Verify that the plugin was installed successfully:
93 93
@@ -97,7 +97,7 @@ To install the Fuel EMC VNX plugin:
97 97
98 id | name | version | package_version 98 id | name | version | package_version
99 ---|---------|---------|---------------- 99 ---|---------|---------|----------------
100 1 | emc_vnx | 3.0.0 | 3.0.0 100 1 | emc_vnx | 4.0.0 | 4.0.0
101 101
102#. Proceed to :ref:`configure_env`. 102#. Proceed to :ref:`configure_env`.
103 103
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index 9d6b06c..537a9be 100644
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -2,7 +2,7 @@ Introduction
2============ 2============
3 3
4This documentation provides instructions for installing, configuring, and 4This documentation provides instructions for installing, configuring, and
5using the Fuel EMC VNX plugin version 3.0.0. 5using the Fuel EMC VNX plugin version 4.0.0.
6 6
7The EMC VNX plugin for Fuel extends the Mirantis OpenStack functionality by 7The EMC VNX plugin for Fuel extends the Mirantis OpenStack functionality by
8adding support for the EMC VNX arrays in Cinder using the iSCSI protocol. It 8adding support for the EMC VNX arrays in Cinder using the iSCSI protocol. It
diff --git a/doc/source/limitations.rst b/doc/source/limitations.rst
index 6a8a364..1cf7d6b 100644
--- a/doc/source/limitations.rst
+++ b/doc/source/limitations.rst
@@ -5,7 +5,7 @@ Limitations
5 5
6The EMC VNX plugin has the following limitations: 6The EMC VNX plugin has the following limitations:
7 7
8#. Since only one storage network is available in Fuel 8.x on OpenStack 8#. Since only one storage network is available in Fuel on OpenStack
9 nodes, multipath will bind all storage paths from EMC on one network 9 nodes, multipath will bind all storage paths from EMC on one network
10 interface. In case this NIC fails, the communication with storage is 10 interface. In case this NIC fails, the communication with storage is
11 lost. 11 lost.
diff --git a/doc/source/release-notes.rst b/doc/source/release-notes.rst
index f7b5198..e7ccb18 100644
--- a/doc/source/release-notes.rst
+++ b/doc/source/release-notes.rst
@@ -1,8 +1,10 @@
1Release notes 1Release notes
2============= 2=============
3 3
4The EMC VNX plugin 3.0.0 contains the following updates: 4The EMC VNX plugin 4.0.0 contains the following updates:
5 5
6* Added support for Fuel 8.0. 6* Added support for Fuel 9.0.
7* Added FC driver support
8* Added support for task-based deployment.
7* Enhanced the EMC VNX plugin overall performance. 9* Enhanced the EMC VNX plugin overall performance.
8* Improved the EMC VNX plugin documentation. 10* Improved the EMC VNX plugin documentation.
diff --git a/doc/source/removal.rst b/doc/source/removal.rst
index 59f104c..5812037 100644
--- a/doc/source/removal.rst
+++ b/doc/source/removal.rst
@@ -14,7 +14,7 @@ To uninstall the EMC VNX plugin, complete the following steps:
14 14
15 .. code-block:: console 15 .. code-block:: console
16 16
17 # fuel plugins --remove emc_vnx==3.0.0 17 # fuel plugins --remove emc_vnx==4.0.0
18 18
19#. Verify whether the VMware DVS plugin was uninstalled successfully: 19#. Verify whether the VMware DVS plugin was uninstalled successfully:
20 20
@@ -49,7 +49,7 @@ To uninstall the Zabbix plugin, complete the following steps:
49 # fuel plugins 49 # fuel plugins
50 50
51 The Zabbix plugin should not appear in the output list. 51 The Zabbix plugin should not appear in the output list.
52 52
53.. raw:: latex 53.. raw:: latex
54 54
55 \pagebreak \ No newline at end of file 55 \pagebreak \ No newline at end of file
diff --git a/doc/source/verification.rst b/doc/source/verification.rst
index 4fa9d4c..e17ba99 100644
--- a/doc/source/verification.rst
+++ b/doc/source/verification.rst
@@ -9,6 +9,6 @@ following verification steps:
9#. Log in to the Fuel web UI. 9#. Log in to the Fuel web UI.
10#. Click the :guilabel:`Health Check` tab. 10#. Click the :guilabel:`Health Check` tab.
11#. Run necessary health tests. For details, see 11#. Run necessary health tests. For details, see
12 `Post-deployment check <https://docs.mirantis.com/openstack/fuel/fuel-8.0/fuel-user-guide.html#post-deployment-check>`_. 12 `Post-deployment check <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/verify-environment.html>`_.
13#. Verify that EMC VNX plugin is properly configured by 13#. Verify that EMC VNX plugin is properly configured by
14 :ref:`creating a Cinder volume <user>`. 14 :ref:`creating a Cinder volume <user>`.
diff --git a/doc/source/zabbix-versions.rst b/doc/source/zabbix-versions.rst
index 31085e9..36bbe14 100644
--- a/doc/source/zabbix-versions.rst
+++ b/doc/source/zabbix-versions.rst
@@ -5,8 +5,3 @@ Compatible monitoring plugins
5 5
6The following versions of Zabbix monitoring plugins are compatible with 6The following versions of Zabbix monitoring plugins are compatible with
7the EMC VNX plugin: 7the EMC VNX plugin:
8
9* ``zabbix_monitoring-2.5-2.5.0-1.noarch.rpm``
10* ``zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm``
11* ``zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm``
12* ``zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm``