summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-07-26 08:41:05 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-07-26 08:41:09 +0200
commitae022e358d418f7f9ca4f0ed1987bc5f8e7d7dc6 (patch)
tree674b5b1182ab9324601c65e5ce4d0dfa25566a50
parentf8a93642a913a0d7d3bdf7455e9fc6d10e395263 (diff)
Add full support for MOS 9.0
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 29 Jul 2016 10:04:05 +0000 Reviewed-on: https://review.openstack.org/347146 Project: openstack/fuel-plugin-zabbix-monitoring-extreme-networks Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml39
-rw-r--r--tasks.yaml15
2 files changed, 38 insertions, 16 deletions
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index fe92594..9ebbf44 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,2 +1,37 @@
1--- 1- id: zbx-configure-xtremesnmp-services
2[] 2 type: puppet
3 version: 2.0.0
4 # We use last task of Zabbix SNMP Trap Daemon plugin deployment as an anchor
5 # to order the post-deployment tasks executed
6 # by this plugin. The dependency chain is:
7 # (Zabbix tasks) -> (Zabbix SNMP Trap Daemon tasks) -> (SNMP Extreme plugin tasks)
8 requires: [post_deployment_start, zbx-configure-snmptrapd-services]
9 required_for: [post_deployment_end]
10 role: ['primary-controller']
11 # The crontrollers configuration shouldn't start before primary is finished
12 # hence the cross-depends parameter that is required when running in
13 # a task-based deployment mode.
14 cross-depends:
15 - name: zbx-configure-snmptrapd-services
16 role: [primary-controller]
17 parameters:
18 puppet_manifest: puppet/manifests/zabbix_config.pp
19 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
20 timeout: 300
21
22- id: zbx-configure-xtremesnmptt-services
23 type: puppet
24 version: 2.0.0
25 requires: [post_deployment_start, zbx-configure-xtremesnmp-services]
26 required_for: [post_deployment_end]
27 role: ['primary-controller', 'controller']
28 # The crontrollers configuration shouldn't start before primary is finished
29 # hence the cross-depends parameter that is required when running in
30 # a task-based deployment mode.
31 cross-depends:
32 - name: zbx-configure-xtremesnmp-services
33 role: [primary-controller]
34 parameters:
35 puppet_manifest: puppet/manifests/snmptt_config.pp
36 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules
37 timeout: 300
diff --git a/tasks.yaml b/tasks.yaml
index aa0c015..fe51488 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,14 +1 @@
1- role: ['primary-controller'] []
2 stage: post_deployment/8120
3 type: puppet
4 parameters:
5 puppet_manifest: puppet/manifests/zabbix_config.pp
6 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
7 timeout: 300
8- role: ['primary-controller', 'controller']
9 stage: post_deployment/8121
10 type: puppet
11 parameters:
12 puppet_manifest: puppet/manifests/snmptt_config.pp
13 puppet_modules: puppet/modules:/etc/puppet/modules:../zabbix_monitoring-2.5/puppet/modules:../zabbix_monitoring-2.6/puppet/modules
14 timeout: 300