Browse Source

Merge "Update version for the next delivery"

Jenkins 2 years ago
parent
commit
704cd71252

+ 6
- 6
README.md View File

@@ -15,8 +15,8 @@ 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           |
18
+| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0   |
19
+| Zabbix plugin for Fuel           | 2.6.0           |
20 20
 
21 21
 Installation Guide
22 22
 ==================
@@ -36,20 +36,20 @@ To install SNMP trap daemon plugin, follow these steps:
36 36
     that. If you do not have the Fuel Master node yet, see
37 37
     [Quick Start Guide](https://software.mirantis.com/quick-start/) :
38 38
 
39
-        # scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm root@<Fuel_Master_ip>:/tmp
39
+        # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@<Fuel_Master_ip>:/tmp
40 40
 
41 41
 4. Install the plugin:
42 42
 
43 43
         # cd /tmp
44
-        # fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm
44
+        # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
45 45
 
46 46
 5. Check if the plugin was installed successfully:
47 47
 
48 48
         # fuel plugins
49 49
         id | name              | version | package_version
50 50
         ---|-------------------|---------|----------------
51
-        1  | zabbix_monitoring | 2.5.0   | 3.0.0
52
-        2  | zabbix_snmptrapd  | 1.0.1   | 2.0.0
51
+        1  | zabbix_monitoring | 2.6.0   | 3.0.0
52
+        2  | zabbix_snmptrapd  | 1.1.0   | 3.0.0
53 53
 
54 54
 For more information and instructions, see the SNMP trap daemon plugin Guide
55 55
 in the [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins)

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

@@ -1,6 +1,9 @@
1 1
 Release notes / Changelog
2 2
 =========================
3 3
 
4
+**1.1.0**
5
+* Compatibility with MOS 9.0
6
+
4 7
 **1.0.1**
5 8
 
6 9
 * 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.

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

@@ -17,10 +17,10 @@ additional plugins to add monitoring of SNMP traps specific for their hardware.
17 17
 Requirements
18 18
 ============
19 19
 
20
-====================== ===============
20
+====================== ================
21 21
 Requirement            Version/Comment
22
-====================== ===============
23
-Fuel                   7.0 and 8.0
24
-Zabbix plugin for Fuel 2.5.0
25
-====================== ===============
22
+====================== ================
23
+Fuel                   7.0, 8.0 and 9.0
24
+Zabbix plugin for Fuel 2.6.0
25
+====================== ================
26 26
 

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

@@ -21,20 +21,20 @@ To install SNMP trap daemon for Zabbix plugin, follow these 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_snmptrapd-1.0-1.0.1-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
24
+    # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
25 25
 
26 26
 #. Log into the Fuel Master node. Install the plugin::
27 27
 
28 28
     # cd /tmp
29
-    # fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm
29
+    # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
30 30
 
31 31
 #. Check if the plugin was installed successfully::
32 32
 
33 33
     # fuel plugins
34 34
     id | name                      | version  | package_version
35 35
     ---|---------------------------|----------|----------------
36
-    1  | zabbix_monitoring         | 2.5.0    | 3.0.0
37
-    2  | zabbix_snmptrapd          | 1.0.1    | 3.0.0
36
+    1  | zabbix_monitoring         | 2.6.0    | 3.0.0
37
+    2  | zabbix_snmptrapd          | 1.1.0    | 3.0.0
38 38
 
39 39
 SNMP trap daemon for Zabbix plugin removal
40 40
 ==========================================
@@ -45,7 +45,7 @@ To uninstall SNMP Trap Daemon for Zabbix plugin, follow these steps:
45 45
 
46 46
 #. Uninstall the plugin::
47 47
 
48
-     # fuel plugins --remove zabbix_snmptrapd==1.0.1
48
+     # fuel plugins --remove zabbix_snmptrapd==1.1.0
49 49
 
50 50
 #. Check if the plugin was uninstalled successfully::
51 51
 

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

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

+ 2
- 2
doc/qa/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.

+ 2
- 2
doc/specs/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.

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

@@ -118,8 +118,8 @@ Work Items
118 118
 Dependencies
119 119
 ============
120 120
 
121
-* Fuel 7.0 and 8.0
122
-* Zabbix plugin for Fuel 2.5.0
121
+* Fuel 7.0, 8.0 and 9.0
122
+* Zabbix plugin for Fuel 2.6.0
123 123
 
124 124
 Testing
125 125
 =======

+ 12
- 2
metadata.yaml View File

@@ -2,11 +2,11 @@
2 2
 name: zabbix_snmptrapd
3 3
 title: SNMP trap daemon for Zabbix plugin
4 4
 # Plugin version
5
-version: 1.0.1
5
+version: 1.1.0
6 6
 # Description
7 7
 description: Gives ability to receive SNMP traps and pass them to Zabbix.
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'

Loading…
Cancel
Save