From 45bcbdecb7646e60e0af027b4739a6b356ade64f Mon Sep 17 00:00:00 2001 From: Olivier Bourdon Date: Tue, 10 Jan 2017 09:03:44 +0100 Subject: [PATCH] Update for 2.5.2 release Change-Id: Id55e44d4a41f37d326306d8d9da67d3fe7e89d91 --- README.md | 8 ++++---- doc/plugin-guide/source/changelog.rst | 9 +++++++++ doc/plugin-guide/source/conf.py | 2 +- doc/plugin-guide/source/description.rst | 8 ++++---- doc/plugin-guide/source/installation.rst | 8 ++++---- doc/plugin-guide/source/limitations.rst | 4 ++-- doc/plugin-guide/source/revisionhistory.rst | 3 +++ doc/plugin-guide/source/troubleshooting.rst | 2 +- doc/qa/source/conf.py | 2 +- doc/qa/source/test-strategy.rst | 14 +++++++------- doc/specs/source/conf.py | 2 +- doc/specs/source/index.rst | 6 +++--- metadata.yaml | 2 +- 13 files changed, 41 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index f8cc6f3..6e73706 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ and OpenStack services and APIs. Requirements ------------ -| Requirement | Version/Comment | -|:---------------------------------|:-------------------| -| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | +| Requirement | Version/Comment | +|:---------------------------------|:------------------------| +| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, 9.2 | Installation Guide ================== @@ -43,7 +43,7 @@ To install Zabbix plugin, follow these steps: # fuel plugins id | name | version | package_version ---|-------------------|---------|---------------- - 1 | zabbix_monitoring | 2.5.1 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 For further details see the Zabbix Plugin Guide in the [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins) diff --git a/doc/plugin-guide/source/changelog.rst b/doc/plugin-guide/source/changelog.rst index 662b5fa..6489550 100644 --- a/doc/plugin-guide/source/changelog.rst +++ b/doc/plugin-guide/source/changelog.rst @@ -1,6 +1,15 @@ Release notes / Changelog ========================= +**2.5.2** + +* Compatibility with MOS 7.0, 8.0, 9.0, 9.1 and 9.2 +* VIP becomes unavailable after its Controller reboot if Zabbix with OVS bridges are used (bug 1644821_) +* Error when deploying on MOS 9.0 env with modified hostnames (bug 1633701_) + +.. _1644821: https://bugs.launchpad.net/fuel-plugins/+bug/1644821 +.. _1633701: https://bugs.launchpad.net/fuel-plugins/+bug/1633701 + **2.5.1** * Compatibility with MOS 7.0, 8.0, 9.0 and 9.1 diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py index 85c2a93..e59be52 100644 --- a/doc/plugin-guide/source/conf.py +++ b/doc/plugin-guide/source/conf.py @@ -56,7 +56,7 @@ author = u'Mirantis Inc.' # The short X.Y version. version = '2.5' # The full version, including alpha/beta/rc tags. -release = '2.5-2.5.1-1' +release = '2.5-2.5.2-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst index 88a936b..f7c0058 100644 --- a/doc/plugin-guide/source/description.rst +++ b/doc/plugin-guide/source/description.rst @@ -10,11 +10,11 @@ services and APIs. Requirements ============ -=========== ===================== +=========== ========================== Requirement Version/Comment -=========== ===================== -Fuel 7.0, 8.0, 9.0 and 9.1 -=========== ===================== +=========== ========================== +Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 +=========== ========================== Operational limitations ======================= diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 1866c1d..a8b1745 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -17,19 +17,19 @@ To install Zabbix plugin, follow these steps: Fuel Master node using SSH. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_monitoring-2.5-2.5.1-1.noarch.rpm root@:/tmp + # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm root@:/tmp #. Log into the Fuel Master node. Install the plugin:: # cd /tmp - # fuel plugins --install zabbix_monitoring-2.5-2.5.1-1.noarch.rpm + # fuel plugins --install zabbix_monitoring-2.5-2.5.2-1.noarch.rpm #. Check if the plugin was installed successfully:: # fuel plugins id | name | version | package_version ---|---------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.5.1 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 Zabbix plugin removal ===================== @@ -40,7 +40,7 @@ To uninstall Zabbix plugin, follow these steps: #. Uninstall the plugin:: - # fuel plugins --remove zabbix_monitoring==2.5.1 + # fuel plugins --remove zabbix_monitoring==2.5.2 #. Check if the plugin was uninstalled successfully:: diff --git a/doc/plugin-guide/source/limitations.rst b/doc/plugin-guide/source/limitations.rst index 65dc25b..7dbdb75 100644 --- a/doc/plugin-guide/source/limitations.rst +++ b/doc/plugin-guide/source/limitations.rst @@ -19,8 +19,8 @@ Reduced footprint The Zabbix plugin does not support reduced footprint deployment for Fuel 7.0 and Fuel 8.0. `LP1610217 `_ -The Zabbix plugin version 2.5.1 supports the reduced footprint deployment -with Fuel 9.x **only**. To deploy a corresponding OpenStack environment: +The Zabbix plugin version 2.5.2 supports the reduced footprint deployment +starting with Fuel 9.x **only**. To deploy a corresponding OpenStack environment: #. Enable the `reduced footprint `_ feature and deploy all ``virt`` nodes **without** enabling the Zabbix diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst index 23d4e81..f6af84b 100644 --- a/doc/plugin-guide/source/revisionhistory.rst +++ b/doc/plugin-guide/source/revisionhistory.rst @@ -50,5 +50,8 @@ Version Revision date Editor Comment ------- ------------- ---------------------------- --------------------- 2.5.1 10.19.2016 Olivier Bourdon Added MOS 9.1 support (obourdon@mirantis.com) +------- ------------- ---------------------------- --------------------- +2.5.2 01.10.2017 Olivier Bourdon Added MOS 9.2 support + (obourdon@mirantis.com) Bug Fixes ======= ============= ============================ ===================== diff --git a/doc/plugin-guide/source/troubleshooting.rst b/doc/plugin-guide/source/troubleshooting.rst index 4c641c0..46b80cd 100644 --- a/doc/plugin-guide/source/troubleshooting.rst +++ b/doc/plugin-guide/source/troubleshooting.rst @@ -32,7 +32,7 @@ Finding the management VIP On the returned node from the command above for a given environment, you might also want to know what is the Zabbix VIP address, so run the following command on Fuel master node:: - # ssh -q node-4 ip netns exec haproxy ifconfig b_zbx_vip_mgmt | \ + # ssh -q node-4 ip netns exec zabbix ifconfig b_zbx_vip_mgmt | \ grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//' 192.168.0.3 # ssh -q node-4 awk '/zbx_vip_mgmt/ {n=1} n==1 && /ipaddr/ {print;exit}' \ diff --git a/doc/qa/source/conf.py b/doc/qa/source/conf.py index 2e11c53..936f2ab 100644 --- a/doc/qa/source/conf.py +++ b/doc/qa/source/conf.py @@ -56,7 +56,7 @@ author = u'Mirantis Inc.' # The short X.Y version. version = '2.5' # The full version, including alpha/beta/rc tags. -release = '2.5-2.5.1-1' +release = '2.5-2.5.2-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/qa/source/test-strategy.rst b/doc/qa/source/test-strategy.rst index 33723fc..5a2c49e 100644 --- a/doc/qa/source/test-strategy.rst +++ b/doc/qa/source/test-strategy.rst @@ -23,11 +23,11 @@ Test environment, infrastructure and tools Product compatibility matrix ============================ -+--------------------+----------------------+ -| Product | Version/Comment | -+====================+======================+ -| Mirantis OpenStack | 7.0, 8.0, 9.0 and 9.1| -+--------------------+----------------------+ -| Zabbix monitoring | 2.5.1 | -+--------------------+----------------------+ ++--------------------+----------------------------+ +| Product | Version/Comment | ++====================+============================+ +| Mirantis OpenStack | 7.0, 8.0, 9.0, 9.1 and 9.2 | ++--------------------+----------------------------+ +| Zabbix monitoring | 2.5.2 | ++--------------------+----------------------------+ diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py index 8b480e7..d02e6a5 100644 --- a/doc/specs/source/conf.py +++ b/doc/specs/source/conf.py @@ -56,7 +56,7 @@ author = u'Mirantis Inc.' # The short X.Y version. version = '2.5' # The full version, including alpha/beta/rc tags. -release = '2.5-2.5.0-1' +release = '2.5-2.5.2-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst index 35ca608..cd3ee8d 100644 --- a/doc/specs/source/index.rst +++ b/doc/specs/source/index.rst @@ -3,9 +3,9 @@ http://www.apache.org/licenses/LICENSE-2.0 -============================= +================== Zabbix Fuel plugin -============================= +================== Zabbix plugin for Fuel extends Mirantis OpenStack functionality by installing Zabbix monitoring system. @@ -120,7 +120,7 @@ Work Items Dependencies ============ -* Fuel 7.0, 8.0, 9.0 and 9.1 +* Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 Testing ======= diff --git a/metadata.yaml b/metadata.yaml index fe22317..6d9b6c7 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,7 +2,7 @@ name: zabbix_monitoring title: Zabbix for Fuel # Plugin version -version: 2.5.1 +version: 2.5.2 # Description description: Enables Zabbix Monitoring. For information how to access Zabbix UI refer to Zabbix plugin User Guide. Zabbix URL schema is http:///zabbix # Required fuel version