Merge "Support zabbix_plugin 2.5.0"

This commit is contained in:
Jenkins 2015-11-18 17:31:21 +00:00 committed by Gerrit Code Review
commit 3587b31174
1 changed files with 2 additions and 2 deletions

View File

@ -3,12 +3,12 @@
type: puppet
parameters:
puppet_manifest: puppet/manifests/zabbix_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
timeout: 300
- role: ['primary-controller', 'controller']
stage: post_deployment/8121
type: puppet
parameters:
puppet_manifest: puppet/manifests/snmptt_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
timeout: 300