From d95c2bbbc0a20b9a51825d857b2bef87873b4770 Mon Sep 17 00:00:00 2001 From: Olivier Bourdon Date: Tue, 15 Mar 2016 21:28:00 +0100 Subject: [PATCH] Add proper support for MOS 7.0 and MOS 8.0 Change-Id: Ic43d7082ba63a99ac1bffaeacf9150af46e694e4 --- deployment_tasks.yaml | 2 ++ doc/plugin-guide/source/guide.rst | 2 -- doc/plugin-guide/source/installation.rst | 2 +- environment_config.yaml | 4 ++-- metadata.yaml | 2 +- 5 files changed, 6 insertions(+), 6 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 39139ac..312a103 100644 --- a/doc/plugin-guide/source/guide.rst +++ b/doc/plugin-guide/source/guide.rst @@ -18,8 +18,6 @@ Known problems - `#1529643 `_: Zabbix snmptrapd: Service "snmptt" was restarted after executing of task "upload\_core\_repos" -- `#1538617 `_: - Cross-plugin display restrictions for some plugins prevent Settings tab from opening. - See Zabbix Plugin for Fuel Documentation for additional problems Environment configuration diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 695bb69..7ae912c 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -34,7 +34,7 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps: id | name | version | package_version ---|---------------------------|----------|---------------- 1 | zabbix_monitoring | 2.5.0 | 3.0.0 - 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 + 2 | zabbix_snmptrapd | 1.0.1 | 3.0.0 SNMP trap daemon for Zabbix plugin removal ========================================== diff --git a/environment_config.yaml b/environment_config.yaml index 7aa4a45..2cbe56f 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -1,8 +1,8 @@ attributes: metadata: restrictions: - - condition: "settings:zabbix_monitoring == null or settings:zabbix_monitoring.metadata.enabled == false" - action: disable + - condition: "settings:zabbix_monitoring == null or settings:zabbix_monitoring.metadata.enabled == false or cluster:net_provider != 'neutron'" + action: "hide" message: "This plugin requires Zabbix plugin" strict: false community: diff --git a/metadata.yaml b/metadata.yaml index 06c6808..7369b79 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'