Browse Source

Add full support for MOS 9.0

Depends-On: I20789575de58956c5bc33c314d703882cdfe40d8

Change-Id: Ib554435d35c08d95019497da850a6db86812e35b
Olivier Bourdon 2 years ago
parent
commit
993ba7e2db
2 changed files with 38 additions and 16 deletions
  1. 37
    2
      deployment_tasks.yaml
  2. 1
    14
      tasks.yaml

+ 37
- 2
deployment_tasks.yaml View File

@@ -1,2 +1,37 @@
1
----
2
-[]
1
+- id: zbx-configure-emcsnmp-services
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 EMC 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-emcsnmptt-services
23
+  type: puppet
24
+  version: 2.0.0
25
+  requires: [post_deployment_start, zbx-configure-emcsnmp-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-emcsnmp-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

+ 1
- 14
tasks.yaml View File

@@ -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.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.6/puppet/modules
14
-    timeout: 300
1
+[]

Loading…
Cancel
Save