Update version for the next delivery

Change-Id: I4a2078ad91f76542b2ba7a724183b853d8e1b25a
This commit is contained in:
Olivier Bourdon 2016-05-13 09:35:27 +02:00
parent dd5c9b3f48
commit 3529edafd0
10 changed files with 52 additions and 35 deletions

View File

@ -16,9 +16,9 @@ Requirements
| Requirement | Version/Comment |
|:-----------------------------------|:----------------|
| Mirantis OpenStack compatibility | 7.0, 8.0 |
| Zabbix plugin for Fuel | 2.5.0 |
| SNMP trap daemon for Zabbix plugin | 1.0.1 |
| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
| Zabbix plugin for Fuel | 2.6.0 |
| SNMP trap daemon for Zabbix plugin | 1.1.0 |
Installation Guide
==================
@ -42,23 +42,23 @@ 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_extreme_networks-1.0-1.0.1-1.noarch.rpm \
# scp zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm \
root@<Fuel_Master_ip>:/tmp
5. Install the plugin:
# cd /tmp
# fuel plugins --install \
zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm
zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm
6. Check if the plugin was installed successfully:
# fuel plugins
id | name | version | package_version
---|------------------------------------|---------|----------------
1 | zabbix_monitoring | 2.5.0 | 3.0.0
2 | zabbix_snmptrapd | 1.0.1 | 2.0.0
3 | zabbix_monitoring_extreme_networks | 1.0.1 | 2.0.0
1 | zabbix_monitoring | 2.6.0 | 3.0.0
2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0
For more information and instructions, see the Extreme Networks hardware
monitoring extension for Zabbix plugin Guide in the

View File

@ -1,6 +1,10 @@
Release notes / Changelog
=========================
**1.1.0**
* Compatibility with MOS 9.0
**1.0.1**
* Compatibility with MOS 8.0

View File

@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '1.0-1.0.1-1'
release = '1.1-1.1.0-1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View File

@ -15,11 +15,11 @@ Networks hardware.
Requirements
============
================================== ===============
================================== ================
Requirement Version/Comment
================================== ===============
Fuel 7.0 and 8.0
Zabbix plugin for Fuel 2.5.0
SNMP trap daemon for Zabbix plugin 1.0.1
================================== ===============
================================== ================
Fuel 7.0, 8.0 and 9.0
Zabbix plugin for Fuel 2.6.0
SNMP trap daemon for Zabbix plugin 1.1.0
================================== ================

View File

@ -26,11 +26,11 @@ follow these steps:
Fuel Master node using ssh. 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 \
# scp zabbix_monitoring-2.6-2.6.0-1.noarch.rpm \
root@<Fuel_Master_IP>:/tmp
# scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm \
# scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \
root@<Fuel_Master_IP>:/tmp
# scp zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm \
# scp zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm \
root@<Fuel_Master_IP>:/tmp
#. Log into the Fuel Master node. Install each of the three plugins using
@ -38,20 +38,20 @@ follow these steps:
# cd /tmp
# fuel plugins --install \
zabbix_monitoring-2.5-2.5.0-1.noarch.rpm
zabbix_monitoring-2.6-2.6.0-1.noarch.rpm
# fuel plugins --install \
zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm
zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
# fuel plugins --install \
zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm
zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm
6# Make sure the plugins were installed correctly::
# fuel plugins
id | name | version | package_version
---|------------------------------------|----------|----------------
1 | zabbix_monitoring | 2.5.0 | 3.0.0
2 | zabbix_snmptrapd | 1.0.1 | 3.0.0
3 | zabbix_monitoring_extreme_networks | 1.0.1 | 3.0.0
1 | zabbix_monitoring | 2.6.0 | 3.0.0
2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0
Extreme Networks hardware monitoring extension removal
======================================================
@ -64,7 +64,7 @@ for Zabbix plugin has been enabled.
#. Uninstall the plugin::
# fuel plugins --remove zabbix_monitoring_extreme_networks==1.0.1
# fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.0
#. Check if the plugin was uninstalled successfully::

View File

@ -23,5 +23,8 @@ Version Revision date Editor Comment
1.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support
(obourdon@mirantis.com)
Doc fixes
------- ------------- ---------------------------- ---------------------
1.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support
(obourdon@mirantis.com)
======= ============= ============================ =====================

View File

@ -57,9 +57,9 @@ author = u'Mirantis'
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '1.0-1.0.1-1'
release = '1.1-1.1.0-1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View File

@ -119,9 +119,9 @@ Work Items
Dependencies
============
* Fuel 7.0 and 80
* Zabbix plugin for Fuel 2.5.0
* SNMP trap daemon for Zabbix plugin 1.0.1
* Fuel 7.0, 8.0 and 9.0
* Zabbix plugin for Fuel 2.6.0
* SNMP trap daemon for Zabbix plugin 1.1.0
Testing
=======

View File

@ -2,11 +2,11 @@
name: zabbix_monitoring_extreme_networks
title: Extreme Networks hardware monitoring extension for Zabbix plugin
# Plugin version
version: 1.0.1
version: 1.1.0
# Description
description: Adds Extreme Networks hardware monitoring to Zabbix plugin
# Required fuel version
fuel_version: ['7.0', '8.0']
fuel_version: ['7.0', '8.0', '9.0']
# Groups
groups: ['monitoring']
# Licenses
@ -28,6 +28,16 @@ releases:
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: ubuntu
version: liberty-9.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: ubuntu
version: mitaka-9.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
# Version of plugin package
package_version: '3.0.0'

View File

@ -3,12 +3,12 @@
type: puppet
parameters:
puppet_manifest: puppet/manifests/zabbix_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
timeout: 300
- role: ['primary-controller', 'controller']
stage: post_deployment/8121
type: puppet
parameters:
puppet_manifest: puppet/manifests/snmptt_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
timeout: 300