Browse Source

Merge "Update version for the next delivery"

Jenkins 2 years ago
parent
commit
f8a93642a9

+ 8
- 8
README.md View File

@@ -16,9 +16,9 @@ Requirements
16 16
 
17 17
 | Requirement                        | Version/Comment |
18 18
 |:-----------------------------------|:----------------|
19
-| Mirantis OpenStack compatibility   | 7.0, 8.0        |
20
-| Zabbix plugin for Fuel             | 2.5.0           |
21
-| SNMP trap daemon for Zabbix plugin | 1.0.1           |
19
+| Mirantis OpenStack compatibility   | 7.0, 8.0, 9.0   |
20
+| Zabbix plugin for Fuel             | 2.6.0           |
21
+| SNMP trap daemon for Zabbix plugin | 1.1.0           |
22 22
 
23 23
 Installation Guide
24 24
 ==================
@@ -42,23 +42,23 @@ follow these steps:
42 42
     that. If you do not have the Fuel Master node yet, see
43 43
     [Quick Start Guide](https://software.mirantis.com/quick-start/) :
44 44
 
45
-        # scp zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm \
45
+        # scp zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm \
46 46
           root@<Fuel_Master_ip>:/tmp
47 47
 
48 48
 5. Install the plugin:
49 49
 
50 50
         # cd /tmp
51 51
         # fuel plugins --install \
52
-          zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm
52
+          zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm
53 53
 
54 54
 6. Check if the plugin was installed successfully:
55 55
 
56 56
         # fuel plugins
57 57
         id | name                               | version | package_version
58 58
         ---|------------------------------------|---------|----------------
59
-        1  | zabbix_monitoring                  | 2.5.0   | 3.0.0
60
-        2  | zabbix_snmptrapd                   | 1.0.1   | 2.0.0
61
-        3  | zabbix_monitoring_extreme_networks | 1.0.1   | 2.0.0
59
+        1  | zabbix_monitoring                  | 2.6.0   | 3.0.0
60
+        2  | zabbix_snmptrapd                   | 1.1.0   | 3.0.0
61
+        3  | zabbix_monitoring_extreme_networks | 1.1.0   | 3.0.0
62 62
 
63 63
 For more information and instructions, see the Extreme Networks hardware
64 64
 monitoring extension 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

@@ -15,11 +15,11 @@ Networks hardware.
15 15
 Requirements
16 16
 ============
17 17
 
18
-================================== ===============
18
+================================== ================
19 19
 Requirement                        Version/Comment
20
-================================== ===============
21
-Fuel                               7.0 and 8.0
22
-Zabbix plugin for Fuel             2.5.0
23
-SNMP trap daemon for Zabbix plugin 1.0.1
24
-================================== ===============
20
+================================== ================
21
+Fuel                               7.0, 8.0 and 9.0
22
+Zabbix plugin for Fuel             2.6.0
23
+SNMP trap daemon for Zabbix plugin 1.1.0
24
+================================== ================
25 25
 

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

@@ -26,11 +26,11 @@ follow these steps:
26 26
    Fuel Master node using ssh. If you do not have the Fuel Master node yet,
27 27
    see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
28 28
 
29
-    # scp zabbix_monitoring-2.5-2.5.0-1.noarch.rpm \
29
+    # scp zabbix_monitoring-2.6-2.6.0-1.noarch.rpm \
30 30
       root@<Fuel_Master_IP>:/tmp
31
-    # scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm \
31
+    # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \
32 32
       root@<Fuel_Master_IP>:/tmp
33
-    # scp zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm \
33
+    # scp zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm \
34 34
       root@<Fuel_Master_IP>:/tmp
35 35
 
36 36
 #. Log into the Fuel Master node. Install each of the three plugins using
@@ -38,20 +38,20 @@ follow these steps:
38 38
 
39 39
     # cd /tmp
40 40
     # fuel plugins --install \
41
-      zabbix_monitoring-2.5-2.5.0-1.noarch.rpm
41
+      zabbix_monitoring-2.6-2.6.0-1.noarch.rpm
42 42
     # fuel plugins --install \
43
-      zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm
43
+      zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
44 44
     # fuel plugins --install \
45
-      zabbix_monitoring_extreme_networks-1.0-1.0.1-1.noarch.rpm
45
+      zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm
46 46
 
47 47
 6# Make sure the plugins were installed correctly::
48 48
 
49 49
     # fuel plugins
50 50
     id | name                               | version  | package_version
51 51
     ---|------------------------------------|----------|----------------
52
-    1  | zabbix_monitoring                  | 2.5.0    | 3.0.0
53
-    2  | zabbix_snmptrapd                   | 1.0.1    | 3.0.0
54
-    3  | zabbix_monitoring_extreme_networks | 1.0.1    | 3.0.0
52
+    1  | zabbix_monitoring                  | 2.6.0    | 3.0.0
53
+    2  | zabbix_snmptrapd                   | 1.1.0    | 3.0.0
54
+    3  | zabbix_monitoring_extreme_networks | 1.1.0    | 3.0.0
55 55
 
56 56
 Extreme Networks hardware monitoring extension removal
57 57
 ======================================================
@@ -64,7 +64,7 @@ for Zabbix plugin has been enabled.
64 64
 
65 65
 #. Uninstall the plugin::
66 66
 
67
-     # fuel plugins --remove zabbix_monitoring_extreme_networks==1.0.1
67
+     # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.0
68 68
 
69 69
 #. Check if the plugin was uninstalled successfully::
70 70
 

+ 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

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

+ 12
- 2
metadata.yaml View File

@@ -2,11 +2,11 @@
2 2
 name: zabbix_monitoring_extreme_networks
3 3
 title: Extreme Networks 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 Extreme Networks 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.5/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.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
14 14
     timeout: 300

Loading…
Cancel
Save