Merge "Update version for the next delivery"
This commit is contained in:
commit
46ad9590fe
@ -14,7 +14,7 @@ Requirements
|
||||
|
||||
| Requirement | Version/Comment |
|
||||
|:---------------------------------|:----------------|
|
||||
| Mirantis OpenStack compatibility | 7.0, 8.0 |
|
||||
| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
|
||||
|
||||
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.0 | 3.0.0
|
||||
1 | zabbix_monitoring | 2.6.0 | 3.0.0
|
||||
|
||||
For further details see the Zabbix Plugin Guide in the
|
||||
[Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins)
|
||||
|
@ -57,9 +57,9 @@ author = u'Mirantis'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '2.5.0'
|
||||
version = '2.6'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2.5.0'
|
||||
release = '2.6.0'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -10,15 +10,19 @@ services and APIs.
|
||||
Requirements
|
||||
============
|
||||
|
||||
================================== ===============
|
||||
================================== ================
|
||||
Requirement Version/Comment
|
||||
================================== ===============
|
||||
Fuel 7.0 and 8.0
|
||||
================================== ===============
|
||||
================================== ================
|
||||
Fuel 7.0, 8.0 and 9.0
|
||||
================================== ================
|
||||
|
||||
Release Notes
|
||||
=============
|
||||
|
||||
**2.6.0**
|
||||
|
||||
* Compatibility with MOS 7.0, 8.0 and 9.0
|
||||
|
||||
**2.5.0**
|
||||
|
||||
* Service "zabbix_server" was restarted after executing of task "upload_core_repos" (bug 1529642_)
|
||||
|
@ -15,17 +15,17 @@ To install Zabbix plugin, follow these steps:
|
||||
that. If you do not have the Fuel Master node yet, see `Quick Start Guide
|
||||
<https://software.mirantis.com/quick-start/>`_::
|
||||
|
||||
# scp zabbix_monitoring-2.5-2.5.0-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
|
||||
# scp zabbix_monitoring-2.5-2.6.0-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
|
||||
|
||||
#. Log into the Fuel Master node. Install the plugin::
|
||||
|
||||
# cd /tmp
|
||||
# fuel plugins --install zabbix_monitoring-2.5-2.5.0-1.noarch.rpm
|
||||
# fuel plugins --install zabbix_monitoring-2.6-2.6.0-1.noarch.rpm
|
||||
|
||||
#. Check if the plugin was installed successfully::
|
||||
|
||||
# fuel plugins
|
||||
id | name | version | package_version
|
||||
---|---------------------------|----------|----------------
|
||||
1 | zabbix_monitoring | 2.5.0 | 3.0.0
|
||||
1 | zabbix_monitoring | 2.6.0 | 3.0.0
|
||||
|
||||
|
@ -9,7 +9,7 @@ To uninstall Zabbix plugin, follow these steps:
|
||||
|
||||
::
|
||||
|
||||
# fuel plugins --remove zabbix_monitoring==2.5.0
|
||||
# fuel plugins --remove zabbix_monitoring==2.6.0
|
||||
|
||||
#. Check if the plugin was uninstalled successfully:
|
||||
|
||||
|
@ -57,9 +57,9 @@ author = u'Mirantis'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '2.5.0'
|
||||
version = '2.6'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2.5.0'
|
||||
release = '2.6.0'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -26,8 +26,8 @@ Product compatibility matrix
|
||||
+--------------------+-----------------+
|
||||
| Product | Version/Comment |
|
||||
+====================+=================+
|
||||
| Mirantis OpenStack | 7.0 and 8.0 |
|
||||
| Mirantis OpenStack | 7.0, 8.0 and 9.0|
|
||||
+--------------------+-----------------+
|
||||
| Zabbix monitoring | 2.5.0 or higher |
|
||||
| Zabbix monitoring | 2.6.0 |
|
||||
+--------------------+-----------------+
|
||||
|
||||
|
@ -118,7 +118,7 @@ Work Items
|
||||
Dependencies
|
||||
============
|
||||
|
||||
* Fuel 7.0 and 8.0
|
||||
* Fuel 7.0, 8.0 and 9.0
|
||||
|
||||
Testing
|
||||
=======
|
||||
|
Loading…
Reference in New Issue
Block a user