Merge "Add full support for MOS 9.0"

This commit is contained in:
Jenkins 2016-07-29 10:04:05 +00:00 committed by Gerrit Code Review
commit a773ccdf3b
2 changed files with 38 additions and 16 deletions

View File

@ -1,2 +1,37 @@
---
[]
- id: zbx-configure-xtremesnmp-services
type: puppet
version: 2.0.0
# We use last task of Zabbix SNMP Trap Daemon plugin deployment as an anchor
# to order the post-deployment tasks executed
# by this plugin. The dependency chain is:
# (Zabbix tasks) -> (Zabbix SNMP Trap Daemon tasks) -> (SNMP Extreme plugin tasks)
requires: [post_deployment_start, zbx-configure-snmptrapd-services]
required_for: [post_deployment_end]
role: ['primary-controller']
# The crontrollers configuration shouldn't start before primary is finished
# hence the cross-depends parameter that is required when running in
# a task-based deployment mode.
cross-depends:
- name: zbx-configure-snmptrapd-services
role: [primary-controller]
parameters:
puppet_manifest: puppet/manifests/zabbix_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
timeout: 300
- id: zbx-configure-xtremesnmptt-services
type: puppet
version: 2.0.0
requires: [post_deployment_start, zbx-configure-xtremesnmp-services]
required_for: [post_deployment_end]
role: ['primary-controller', 'controller']
# The crontrollers configuration shouldn't start before primary is finished
# hence the cross-depends parameter that is required when running in
# a task-based deployment mode.
cross-depends:
- name: zbx-configure-xtremesnmp-services
role: [primary-controller]
parameters:
puppet_manifest: puppet/manifests/snmptt_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
timeout: 300

View File

@ -1,14 +1 @@
- role: ['primary-controller']
stage: post_deployment/8120
type: puppet
parameters:
puppet_manifest: puppet/manifests/zabbix_config.pp
puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules:../zabbix_monitoring-2.6/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.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
timeout: 300
[]