summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-18 17:31:21 +0000
committerGerrit Code Review <review@openstack.org>2015-11-18 17:31:21 +0000
commit3587b31174df4657eb0c109be15352e1b1a474f5 (patch)
tree51eaf789484482c58c592a47c0fdf4bfa0d1ba3e
parenta617118ed2b50b6784331861425689bc97b09889 (diff)
parent60e4c0d50d2514bb1a61147442c4626d6aea4c68 (diff)
Merge "Support zabbix_plugin 2.5.0"
-rw-r--r--tasks.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks.yaml b/tasks.yaml
index 5764f28..5ccc200 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-2.0/puppet/modules 6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/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-2.0/puppet/modules 13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.0/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
14 timeout: 300 14 timeout: 300