Browse Source

Merge "Update version for the next delivery"

Jenkins 2 years ago
parent
commit
ccc72e665e

+ 8
- 8
README.md View File

@@ -15,9 +15,9 @@ Requirements
15 15
 
16 16
 | Requirement                        | Version/Comment |
17 17
 |:-----------------------------------|:----------------|
18
-| Mirantis OpenStack compatibility   | 7.0, 8.0        |
19
-| Zabbix plugin for Fuel             | 2.5.0           |
20
-| SNMP trap daemon for Zabbix plugin | 1.0.1           |
18
+| Mirantis OpenStack compatibility   | 7.0, 8.0, 9.0   |
19
+| Zabbix plugin for Fuel             | 2.6.0           |
20
+| SNMP trap daemon for Zabbix plugin | 1.1.0           |
21 21
 
22 22
 Installation Guide
23 23
 ==================
@@ -41,22 +41,22 @@ follow these steps:
41 41
     that. If you do not have the Fuel Master node yet, see
42 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 45
           root@<Fuel_Master_ip>:/tmp
46 46
 
47 47
 5. Install the plugin:
48 48
 
49 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
 
52 52
 6. Check if the plugin was installed successfully:
53 53
 
54 54
         # fuel plugins
55 55
         id | name                  | version | package_version
56 56
         ---|-----------------------|---------|----------------
57
-        1  | zabbix_monitoring     | 2.5.0   | 3.0.0
58
-        2  | zabbix_snmptrapd      | 1.0.1   | 2.0.0
59
-        3  | zabbix_monitoring_emc | 1.0.1   | 2.0.0
57
+        1  | zabbix_monitoring     | 2.6.0   | 3.0.0
58
+        2  | zabbix_snmptrapd      | 1.1.0   | 3.0.0
59
+        3  | zabbix_monitoring_emc | 1.1.0   | 3.0.0
60 60
 
61 61
 For more information and instructions, see the EMC hardware monitoring extension
62 62
 for Zabbix plugin Guide in the

+ 4
- 0
doc/plugin-guide/source/changelog.rst View File

@@ -1,6 +1,10 @@
1 1
 Release notes / Changelog
2 2
 =========================
3 3
 
4
+**1.1.0**
5
+
6
+* Compatibility with MOS 9.0
7
+
4 8
 **1.0.1**
5 9
 
6 10
 * Compatibility with MOS 8.0

+ 2
- 2
doc/plugin-guide/source/conf.py View File

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

+ 6
- 6
doc/plugin-guide/source/description.rst View File

@@ -14,11 +14,11 @@ items and triggers and by creating Hosts for each EMC VNX array.
14 14
 Requirements
15 15
 ============
16 16
 
17
-================================== ===============
17
+================================== ================
18 18
 Requirement                        Version/Comment
19
-================================== ===============
20
-Fuel                               7.0 and 8.0
21
-Zabbix plugin for Fuel             2.5.0
22
-SNMP trap daemon for Zabbix plugin 1.0.1
23
-================================== ===============
19
+================================== ================
20
+Fuel                               7.0, 8.0 and 9.0
21
+Zabbix plugin for Fuel             2.6.0
22
+SNMP trap daemon for Zabbix plugin 1.1.0
23
+================================== ================
24 24
 

+ 5
- 5
doc/plugin-guide/source/installation.rst View File

@@ -21,20 +21,20 @@ steps:
21 21
    that. If you do not have the Fuel Master node yet, see `Quick Start Guide
22 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 25
       root@<The_Fuel_Master_node_IP>:/tmp
26 26
 
27 27
 5. Log into the Fuel Master node. Install the plugin::
28 28
 
29 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
 
32 32
 6. Check if the plugin was installed successfully::
33 33
 
34 34
     # fuel plugins
35 35
     id | name                      | version  | package_version
36 36
     ---|---------------------------|----------|----------------
37
-    1  | zabbix_monitoring         | 2.5.0    | 3.0.0
38
-    2  | zabbix_snmptrapd          | 1.0.1    | 3.0.0
39
-    3  | zabbix_monitoring_emc     | 1.0.1    | 3.0.0
37
+    1  | zabbix_monitoring         | 2.6.0    | 3.0.0
38
+    2  | zabbix_snmptrapd          | 1.1.0    | 3.0.0
39
+    3  | zabbix_monitoring_emc     | 1.1.0    | 3.0.0
40 40
 

+ 3
- 0
doc/plugin-guide/source/revisionhistory.rst View File

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

+ 2
- 2
doc/specs/source/conf.py View File

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

+ 3
- 3
doc/specs/source/index.rst View File

@@ -117,9 +117,9 @@ Work Items
117 117
 Dependencies
118 118
 ============
119 119
 
120
-* Fuel 7.0 or 8.0
121
-* Zabbix plugin for Fuel 2.5.0
122
-* SNMP trap daemon for Zabbix plugin 1.0.1
120
+* Fuel 7.0, 8.0 and 9.0
121
+* Zabbix plugin for Fuel 2.6.0
122
+* SNMP trap daemon for Zabbix plugin 1.1.0
123 123
 
124 124
 Testing
125 125
 =======

+ 12
- 2
metadata.yaml View File

@@ -2,11 +2,11 @@
2 2
 name: zabbix_monitoring_emc
3 3
 title: EMC hardware monitoring extension for Zabbix plugin
4 4
 # Plugin version
5
-version: 1.0.1
5
+version: 1.1.0
6 6
 # Description
7 7
 description: Adds EMC hardware monitoring to Zabbix plugin
8 8
 # Required fuel version
9
-fuel_version: ['7.0', '8.0']
9
+fuel_version: ['7.0', '8.0', '9.0']
10 10
 # Groups
11 11
 groups: ['monitoring']
12 12
 # Licenses
@@ -28,6 +28,16 @@ releases:
28 28
     mode: ['ha']
29 29
     deployment_scripts_path: deployment_scripts/
30 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 42
 # Version of plugin package
33 43
 package_version: '3.0.0'

+ 2
- 2
tasks.yaml View File

@@ -3,12 +3,12 @@
3 3
   type: puppet
4 4
   parameters:
5 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 7
     timeout: 300
8 8
 - role: ['primary-controller', 'controller']
9 9
   stage: post_deployment/8121
10 10
   type: puppet
11 11
   parameters:
12 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 14
     timeout: 300

Loading…
Cancel
Save