From f46c9960c238af567ae549bd31e4ef0738f99be2 Mon Sep 17 00:00:00 2001 From: Olivier Bourdon Date: Tue, 15 Mar 2016 21:04:38 +0100 Subject: [PATCH] Add proper support for MOS 7.0 and MOS 8.0 Change-Id: Ic4c3101619f5b6afe59674c928c57ac1b54463f9 --- deployment_tasks.yaml | 2 ++ doc/plugin-guide/source/guide.rst | 2 -- doc/plugin-guide/source/installation.rst | 4 ++-- environment_config.yaml | 4 ++-- metadata.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 deployment_tasks.yaml 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 @@ +--- +[] 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 Known problems ============== -- `#1538617 `_: - Cross-plugin display restrictions for some plugins prevent Settings tab from opening. - See Zabbix Plugin for Fuel Documentation for additional problems - See Zabbix SNMP Trap Daemon Plugin for Fuel Documentation for additional problems 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: id | name | version | package_version ---|---------------------------|----------|---------------- 1 | zabbix_monitoring | 2.5.0 | 3.0.0 - 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 - 3 | zabbix_monitoring_emc | 1.0.1 | 2.0.0 + 2 | zabbix_snmptrapd | 1.0.1 | 3.0.0 + 3 | zabbix_monitoring_emc | 1.0.1 | 3.0.0 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 @@ attributes: metadata: restrictions: - - condition: "settings:zabbix_snmptrapd == null or settings:zabbix_snmptrapd.metadata.enabled == false" - action: disable + - condition: "settings:zabbix_snmptrapd == null or settings:zabbix_snmptrapd.metadata.enabled == false or cluster:net_provider != 'neutron'" + action: "hide" message: This plugin requires SNMP trap daemon for Zabbix plugin strict: false hosts: diff --git a/metadata.yaml b/metadata.yaml index 4ce5e15..e6900cd 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -30,4 +30,4 @@ releases: repository_path: repositories/ubuntu # Version of plugin package -package_version: '2.0.0' +package_version: '3.0.0'