summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-07-20 10:22:52 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-07-20 10:52:03 +0200
commit8b16151a949b6feb06fb09d7b7bc7278f3b89c24 (patch)
tree89083501b1f0863dd3cc00e56da38a6c156b03a3
parentf8a93642a913a0d7d3bdf7455e9fc6d10e395263 (diff)
Roll back version from 2.6.0 to 2.5.1
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 26 Jul 2016 14:51:16 +0000 Reviewed-on: https://review.openstack.org/344639 Project: openstack/fuel-plugin-zabbix-monitoring-extreme-networks Branch: refs/heads/master
-rw-r--r--README.md4
-rw-r--r--doc/plugin-guide/source/description.rst2
-rw-r--r--doc/plugin-guide/source/installation.rst11
-rw-r--r--doc/specs/source/index.rst2
4 files changed, 9 insertions, 10 deletions
diff --git a/README.md b/README.md
index b76ad2f..80ceb5e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Requirements
17| Requirement | Version/Comment | 17| Requirement | Version/Comment |
18|:-----------------------------------|:----------------| 18|:-----------------------------------|:----------------|
19| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 | 19| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
20| Zabbix plugin for Fuel | 2.6.0 | 20| Zabbix plugin for Fuel | 2.5.1 |
21| SNMP trap daemon for Zabbix plugin | 1.1.0 | 21| SNMP trap daemon for Zabbix plugin | 1.1.0 |
22 22
23Installation Guide 23Installation Guide
@@ -56,7 +56,7 @@ follow these steps:
56 # fuel plugins 56 # fuel plugins
57 id | name | version | package_version 57 id | name | version | package_version
58 ---|------------------------------------|---------|---------------- 58 ---|------------------------------------|---------|----------------
59 1 | zabbix_monitoring | 2.6.0 | 3.0.0 59 1 | zabbix_monitoring | 2.5.1 | 3.0.0
60 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 60 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
61 3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0 61 3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0
62 62
diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst
index 974e252..7d3d7df 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -19,7 +19,7 @@ Requirements
19Requirement Version/Comment 19Requirement Version/Comment
20================================== ================ 20================================== ================
21Fuel 7.0, 8.0 and 9.0 21Fuel 7.0, 8.0 and 9.0
22Zabbix plugin for Fuel 2.6.0 22Zabbix plugin for Fuel 2.5.1
23SNMP trap daemon for Zabbix plugin 1.1.0 23SNMP trap daemon for Zabbix plugin 1.1.0
24================================== ================ 24================================== ================
25 25
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index b1455cc..36dbb44 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -26,7 +26,7 @@ follow these steps:
26 Fuel Master node using ssh. If you do not have the Fuel Master node yet, 26 Fuel Master node using ssh. If you do not have the Fuel Master node yet,
27 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_:: 27 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
28 28
29 # scp zabbix_monitoring-2.6-2.6.0-1.noarch.rpm \ 29 # scp zabbix_monitoring-2.5-2.5.1-1.noarch.rpm \
30 root@<Fuel_Master_IP>:/tmp 30 root@<Fuel_Master_IP>:/tmp
31 # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \ 31 # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \
32 root@<Fuel_Master_IP>:/tmp 32 root@<Fuel_Master_IP>:/tmp
@@ -38,18 +38,18 @@ follow these steps:
38 38
39 # cd /tmp 39 # cd /tmp
40 # fuel plugins --install \ 40 # fuel plugins --install \
41 zabbix_monitoring-2.6-2.6.0-1.noarch.rpm 41 zabbix_monitoring-2.5-2.5.1-1.noarch.rpm
42 # fuel plugins --install \ 42 # fuel plugins --install \
43 zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm 43 zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
44 # fuel plugins --install \ 44 # fuel plugins --install \
45 zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm 45 zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm
46 46
476# Make sure the plugins were installed correctly:: 47#. Make sure the plugins were installed correctly::
48 48
49 # fuel plugins 49 # fuel plugins
50 id | name | version | package_version 50 id | name | version | package_version
51 ---|------------------------------------|----------|---------------- 51 ---|------------------------------------|----------|----------------
52 1 | zabbix_monitoring | 2.6.0 | 3.0.0 52 1 | zabbix_monitoring | 2.5.1 | 3.0.0
53 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 53 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
54 3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0 54 3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0
55 55
@@ -59,8 +59,7 @@ Extreme Networks hardware monitoring extension removal
59To uninstall Extreme Networks hardware monitoring extension for Zabbix plugin, 59To uninstall Extreme Networks hardware monitoring extension for Zabbix plugin,
60follow these steps: 60follow these steps:
61 61
62#. Delete all Environments in which Extreme Networks hardware monitoring extension 62#. Delete all environments in which Extreme Networks hardware monitoring extension for Zabbix plugin has been enabled.
63for Zabbix plugin has been enabled.
64 63
65#. Uninstall the plugin:: 64#. Uninstall the plugin::
66 65
diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst
index 8cd5c77..afe8651 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -120,7 +120,7 @@ Dependencies
120============ 120============
121 121
122* Fuel 7.0, 8.0 and 9.0 122* Fuel 7.0, 8.0 and 9.0
123* Zabbix plugin for Fuel 2.6.0 123* Zabbix plugin for Fuel 2.5.1
124* SNMP trap daemon for Zabbix plugin 1.1.0 124* SNMP trap daemon for Zabbix plugin 1.1.0
125 125
126Testing 126Testing