summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-05-13 09:34:45 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-05-13 09:34:45 +0200
commitee84810bf4de2e3cd0b76ffbf41bce8d7aa33e6b (patch)
tree4e4f56ff20b12abe17b2bbb9eb5512b33e0fae63
parent632e77f237981cfb3d3f0f49f04f607b4db1edd3 (diff)
Update version for the next delivery
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 12 Jul 2016 08:29:22 +0000 Reviewed-on: https://review.openstack.org/315935 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--README.md16
-rw-r--r--doc/plugin-guide/source/changelog.rst4
-rw-r--r--doc/plugin-guide/source/conf.py4
-rw-r--r--doc/plugin-guide/source/description.rst12
-rw-r--r--doc/plugin-guide/source/installation.rst10
-rw-r--r--doc/plugin-guide/source/revisionhistory.rst3
-rw-r--r--doc/specs/source/conf.py4
-rw-r--r--doc/specs/source/index.rst6
-rw-r--r--metadata.yaml14
-rw-r--r--tasks.yaml4
10 files changed, 47 insertions, 30 deletions
diff --git a/README.md b/README.md
index 9146c46..66fd852 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ Requirements
15 15
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:-----------------------------------|:----------------| 17|:-----------------------------------|:----------------|
18| Mirantis OpenStack compatibility | 7.0, 8.0 | 18| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
19| Zabbix plugin for Fuel | 2.5.0 | 19| Zabbix plugin for Fuel | 2.6.0 |
20| SNMP trap daemon for Zabbix plugin | 1.0.1 | 20| SNMP trap daemon for Zabbix plugin | 1.1.0 |
21 21
22Installation Guide 22Installation Guide
23================== 23==================
@@ -41,22 +41,22 @@ follow these steps:
41 that. If you do not have the Fuel Master node yet, see 41 that. If you do not have the Fuel Master node yet, see
42 [Quick Start Guide](https://software.mirantis.com/quick-start/) : 42 [Quick Start Guide](https://software.mirantis.com/quick-start/) :
43 43
44 # scp zabbix_monitoring_emc-2.5-2.5.0-1.noarch.rpm \ 44 # scp zabbix_monitoring_emc-2.6-2.6.0-1.noarch.rpm \
45 root@<Fuel_Master_ip>:/tmp 45 root@<Fuel_Master_ip>:/tmp
46 46
475. Install the plugin: 475. Install the plugin:
48 48
49 # cd /tmp 49 # cd /tmp
50 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm 50 # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm
51 51
526. Check if the plugin was installed successfully: 526. Check if the plugin was installed successfully:
53 53
54 # fuel plugins 54 # fuel plugins
55 id | name | version | package_version 55 id | name | version | package_version
56 ---|-----------------------|---------|---------------- 56 ---|-----------------------|---------|----------------
57 1 | zabbix_monitoring | 2.5.0 | 3.0.0 57 1 | zabbix_monitoring | 2.6.0 | 3.0.0
58 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 58 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
59 3 | zabbix_monitoring_emc | 1.0.1 | 2.0.0 59 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0
60 60
61For more information and instructions, see the EMC hardware monitoring extension 61For more information and instructions, see the EMC hardware monitoring extension
62for Zabbix plugin Guide in the 62for Zabbix plugin Guide in the
diff --git a/doc/plugin-guide/source/changelog.rst b/doc/plugin-guide/source/changelog.rst
index 93dcd1b..67b4914 100644
--- a/doc/plugin-guide/source/changelog.rst
+++ b/doc/plugin-guide/source/changelog.rst
@@ -1,6 +1,10 @@
1Release notes / Changelog 1Release notes / Changelog
2========================= 2=========================
3 3
4**1.1.0**
5
6* Compatibility with MOS 9.0
7
4**1.0.1** 8**1.0.1**
5 9
6* Compatibility with MOS 8.0 10* Compatibility with MOS 8.0
diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py
index 1ef4938..6fe7f6a 100644
--- a/doc/plugin-guide/source/conf.py
+++ b/doc/plugin-guide/source/conf.py
@@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
54# built documents. 54# built documents.
55# 55#
56# The short X.Y version. 56# The short X.Y version.
57version = '1.0' 57version = '1.1'
58# The full version, including alpha/beta/rc tags. 58# The full version, including alpha/beta/rc tags.
59release = '1.0-1.0.1-1' 59release = '1.1-1.1.0-1'
60 60
61# The language for content autogenerated by Sphinx. Refer to documentation 61# The language for content autogenerated by Sphinx. Refer to documentation
62# for a list of supported languages. 62# for a list of supported languages.
diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst
index 425785e..89cce0e 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -14,11 +14,11 @@ items and triggers and by creating Hosts for each EMC VNX array.
14Requirements 14Requirements
15============ 15============
16 16
17================================== =============== 17================================== ================
18Requirement Version/Comment 18Requirement Version/Comment
19================================== =============== 19================================== ================
20Fuel 7.0 and 8.0 20Fuel 7.0, 8.0 and 9.0
21Zabbix plugin for Fuel 2.5.0 21Zabbix plugin for Fuel 2.6.0
22SNMP trap daemon for Zabbix plugin 1.0.1 22SNMP trap daemon for Zabbix plugin 1.1.0
23================================== =============== 23================================== ================
24 24
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index a0c1ed6..841ae7a 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -21,20 +21,20 @@ steps:
21 that. If you do not have the Fuel Master node yet, see `Quick Start Guide 21 that. If you do not have the Fuel Master node yet, see `Quick Start Guide
22 <https://software.mirantis.com/quick-start/>`_:: 22 <https://software.mirantis.com/quick-start/>`_::
23 23
24 # scp zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm \ 24 # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \
25 root@<The_Fuel_Master_node_IP>:/tmp 25 root@<The_Fuel_Master_node_IP>:/tmp
26 26
275. Log into the Fuel Master node. Install the plugin:: 275. Log into the Fuel Master node. Install the plugin::
28 28
29 # cd /tmp 29 # cd /tmp
30 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm 30 # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm
31 31
326. Check if the plugin was installed successfully:: 326. Check if the plugin was installed successfully::
33 33
34 # fuel plugins 34 # fuel plugins
35 id | name | version | package_version 35 id | name | version | package_version
36 ---|---------------------------|----------|---------------- 36 ---|---------------------------|----------|----------------
37 1 | zabbix_monitoring | 2.5.0 | 3.0.0 37 1 | zabbix_monitoring | 2.6.0 | 3.0.0
38 2 | zabbix_snmptrapd | 1.0.1 | 3.0.0 38 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
39 3 | zabbix_monitoring_emc | 1.0.1 | 3.0.0 39 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0
40 40
diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst
index 1b7c62e..65c6b3e 100644
--- a/doc/plugin-guide/source/revisionhistory.rst
+++ b/doc/plugin-guide/source/revisionhistory.rst
@@ -23,5 +23,8 @@ Version Revision date Editor Comment
231.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support 231.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support
24 (obourdon@mirantis.com) 24 (obourdon@mirantis.com)
25 Doc fixes 25 Doc fixes
26------- ------------- ---------------------------- ---------------------
271.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support
28 (obourdon@mirantis.com)
26======= ============= ============================ ===================== 29======= ============= ============================ =====================
27 30
diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py
index 8472bd8..15f2433 100644
--- a/doc/specs/source/conf.py
+++ b/doc/specs/source/conf.py
@@ -57,9 +57,9 @@ author = u'Mirantis'
57# built documents. 57# built documents.
58# 58#
59# The short X.Y version. 59# The short X.Y version.
60version = '1.0' 60version = '1.1'
61# The full version, including alpha/beta/rc tags. 61# The full version, including alpha/beta/rc tags.
62release = '1.0-1.0.1-1' 62release = '1.1-1.1.0-1'
63 63
64# The language for content autogenerated by Sphinx. Refer to documentation 64# The language for content autogenerated by Sphinx. Refer to documentation
65# for a list of supported languages. 65# for a list of supported languages.
diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst
index 816ee66..213a91d 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -117,9 +117,9 @@ Work Items
117Dependencies 117Dependencies
118============ 118============
119 119
120* Fuel 7.0 or 8.0 120* Fuel 7.0, 8.0 and 9.0
121* Zabbix plugin for Fuel 2.5.0 121* Zabbix plugin for Fuel 2.6.0
122* SNMP trap daemon for Zabbix plugin 1.0.1 122* SNMP trap daemon for Zabbix plugin 1.1.0
123 123
124Testing 124Testing
125======= 125=======
diff --git a/metadata.yaml b/metadata.yaml
index e6900cd..12c71a1 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,11 +2,11 @@
2name: zabbix_monitoring_emc 2name: zabbix_monitoring_emc
3title: EMC hardware monitoring extension for Zabbix plugin 3title: EMC hardware monitoring extension for Zabbix plugin
4# Plugin version 4# Plugin version
5version: 1.0.1 5version: 1.1.0
6# Description 6# Description
7description: Adds EMC hardware monitoring to Zabbix plugin 7description: Adds EMC hardware monitoring to Zabbix plugin
8# Required fuel version 8# Required fuel version
9fuel_version: ['7.0', '8.0'] 9fuel_version: ['7.0', '8.0', '9.0']
10# Groups 10# Groups
11groups: ['monitoring'] 11groups: ['monitoring']
12# Licenses 12# Licenses
@@ -28,6 +28,16 @@ releases:
28 mode: ['ha'] 28 mode: ['ha']
29 deployment_scripts_path: deployment_scripts/ 29 deployment_scripts_path: deployment_scripts/
30 repository_path: repositories/ubuntu 30 repository_path: repositories/ubuntu
31 - os: ubuntu
32 version: liberty-9.0
33 mode: ['ha']
34 deployment_scripts_path: deployment_scripts/
35 repository_path: repositories/ubuntu
36 - os: ubuntu
37 version: mitaka-9.0
38 mode: ['ha']
39 deployment_scripts_path: deployment_scripts/
40 repository_path: repositories/ubuntu
31 41
32# Version of plugin package 42# Version of plugin package
33package_version: '3.0.0' 43package_version: '3.0.0'
diff --git a/tasks.yaml b/tasks.yaml
index 5ccc200..d95bfaa 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -3,12 +3,12 @@
3 type: puppet 3 type: puppet
4 parameters: 4 parameters:
5 puppet_manifest: puppet/manifests/zabbix_config.pp 5 puppet_manifest: puppet/manifests/zabbix_config.pp
6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules 6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
7 timeout: 300 7 timeout: 300
8- role: ['primary-controller', 'controller'] 8- role: ['primary-controller', 'controller']
9 stage: post_deployment/8121 9 stage: post_deployment/8121
10 type: puppet 10 type: puppet
11 parameters: 11 parameters:
12 puppet_manifest: puppet/manifests/snmptt_config.pp 12 puppet_manifest: puppet/manifests/snmptt_config.pp
13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules 13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
14 timeout: 300 14 timeout: 300