summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-03-15 21:04:38 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2016-03-21 12:47:40 +0100
commitf46c9960c238af567ae549bd31e4ef0738f99be2 (patch)
tree8de6b7e46c0ab035248cb78069e0131b42facc99
parentbc67fcce7b9db58c6b1312fac17d65c2b4cecca7 (diff)
Add proper support for MOS 7.0 and MOS 8.0
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: Mon, 21 Mar 2016 11:54:05 +0000 Reviewed-on: https://review.openstack.org/293115 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml2
-rw-r--r--doc/plugin-guide/source/guide.rst2
-rw-r--r--doc/plugin-guide/source/installation.rst4
-rw-r--r--environment_config.yaml4
-rw-r--r--metadata.yaml2
5 files changed, 7 insertions, 7 deletions
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
new file mode 100644
index 0000000..fe92594
--- /dev/null
+++ b/deployment_tasks.yaml
@@ -0,0 +1,2 @@
1---
2[]
diff --git a/doc/plugin-guide/source/guide.rst b/doc/plugin-guide/source/guide.rst
index 386e6af..a04e56b 100644
--- a/doc/plugin-guide/source/guide.rst
+++ b/doc/plugin-guide/source/guide.rst
@@ -17,8 +17,6 @@ Important preliminary notes
17Known problems 17Known problems
18============== 18==============
19 19
20- `#1538617 <https://bugs.launchpad.net/fuel-plugins/+bug/1538617>`_:
21 Cross-plugin display restrictions for some plugins prevent Settings tab from opening.
22- See Zabbix Plugin for Fuel Documentation for additional problems 20- See Zabbix Plugin for Fuel Documentation for additional problems
23- See Zabbix SNMP Trap Daemon Plugin for Fuel Documentation for additional problems 21- See Zabbix SNMP Trap Daemon Plugin for Fuel Documentation for additional problems
24 22
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 060539f..a0c1ed6 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -35,6 +35,6 @@ steps:
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.5.0 | 3.0.0
38 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 38 2 | zabbix_snmptrapd | 1.0.1 | 3.0.0
39 3 | zabbix_monitoring_emc | 1.0.1 | 2.0.0 39 3 | zabbix_monitoring_emc | 1.0.1 | 3.0.0
40 40
diff --git a/environment_config.yaml b/environment_config.yaml
index 7d235d0..1d72a1a 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,8 +1,8 @@
1attributes: 1attributes:
2 metadata: 2 metadata:
3 restrictions: 3 restrictions:
4 - condition: "settings:zabbix_snmptrapd == null or settings:zabbix_snmptrapd.metadata.enabled == false" 4 - condition: "settings:zabbix_snmptrapd == null or settings:zabbix_snmptrapd.metadata.enabled == false or cluster:net_provider != 'neutron'"
5 action: disable 5 action: "hide"
6 message: This plugin requires SNMP trap daemon for Zabbix plugin 6 message: This plugin requires SNMP trap daemon for Zabbix plugin
7 strict: false 7 strict: false
8 hosts: 8 hosts:
diff --git a/metadata.yaml b/metadata.yaml
index 4ce5e15..e6900cd 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -30,4 +30,4 @@ releases:
30 repository_path: repositories/ubuntu 30 repository_path: repositories/ubuntu
31 31
32# Version of plugin package 32# Version of plugin package
33package_version: '2.0.0' 33package_version: '3.0.0'