summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Misiak <pmisiak@mirantis.com>2015-08-12 10:49:28 +0200
committerPiotr Misiak <pmisiak@mirantis.com>2015-08-12 10:49:28 +0200
commitcf38dcaf6838c35943d406bb666e04580d9a3581 (patch)
treeecdfa9ff08e8479526f678ac0f0d1686e44805aa
parenta0d0ed2b4e2577e7a56123743b9d2a5a667da951 (diff)
change compatible MOS versions and Zabbix plugin module path in tasks.yaml
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Bartosz Kupidura <bkupidura@mirantis.com> Workflow+1: Bartosz Kupidura <bkupidura@mirantis.com> Code-Review+1: Maciej Relewicz <mrelewicz@mirantis.com> Submitted-by: Jenkins Submitted-at: Thu, 13 Aug 2015 07:59:04 +0000 Reviewed-on: https://review.openstack.org/211908 Project: stackforge/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--metadata.yaml6
-rw-r--r--tasks.yaml4
2 files changed, 5 insertions, 5 deletions
diff --git a/metadata.yaml b/metadata.yaml
index b891ce2..27fbac6 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -6,7 +6,7 @@ version: 1.0.0
6# Description 6# Description
7description: Adds EMC hardware monitoring to Zabbix plugin 7description: Adds EMC hardware monitoring to Zabbix plugin
8# Required fuel version 8# Required fuel version
9fuel_version: ['6.1'] 9fuel_version: ['7.0']
10# Groups 10# Groups
11groups: ['monitoring'] 11groups: ['monitoring']
12# Licenses 12# Licenses
@@ -19,12 +19,12 @@ authors: ['Dmitry Klenov <dklenov@mirantis.com>', 'Piotr Misiak <pmisiak@miranti
19# The plugin is compatible with releases in the list 19# The plugin is compatible with releases in the list
20releases: 20releases:
21 - os: ubuntu 21 - os: ubuntu
22 version: 2014.2-6.1 22 version: 2015.1.0-7.0
23 mode: ['ha'] 23 mode: ['ha']
24 deployment_scripts_path: deployment_scripts/ 24 deployment_scripts_path: deployment_scripts/
25 repository_path: repositories/ubuntu 25 repository_path: repositories/ubuntu
26 - os: centos 26 - os: centos
27 version: 2014.2-6.1 27 version: 2015.1.0-7.0
28 mode: ['ha'] 28 mode: ['ha']
29 deployment_scripts_path: deployment_scripts/ 29 deployment_scripts_path: deployment_scripts/
30 repository_path: repositories/centos 30 repository_path: repositories/centos
diff --git a/tasks.yaml b/tasks.yaml
index d8377ce..5764f28 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -3,12 +3,12 @@
3 type: puppet 3 type: puppet
4 parameters: 4 parameters:
5 puppet_manifest: puppet/manifests/zabbix_config.pp 5 puppet_manifest: puppet/manifests/zabbix_config.pp
6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-1.0/puppet/modules 6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules
7 timeout: 300 7 timeout: 300
8- role: ['primary-controller', 'controller'] 8- role: ['primary-controller', 'controller']
9 stage: post_deployment/8121 9 stage: post_deployment/8121
10 type: puppet 10 type: puppet
11 parameters: 11 parameters:
12 puppet_manifest: puppet/manifests/snmptt_config.pp 12 puppet_manifest: puppet/manifests/snmptt_config.pp
13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-1.0/puppet/modules 13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules
14 timeout: 300 14 timeout: 300