Browse Source

Merge "Add full support for MOS 9.0"

Jenkins 2 years ago
parent
commit
79ba34e999
2 changed files with 23 additions and 9 deletions
  1. 22
    2
      deployment_tasks.yaml
  2. 1
    7
      tasks.yaml

+ 22
- 2
deployment_tasks.yaml View File

@@ -1,2 +1,22 @@
1
----
2
-[]
1
+- id: zbx-configure-snmptrapd-services
2
+  type: puppet
3
+  version: 2.0.0
4
+  # We use last task of Zabbix 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)
8
+  requires: [post_deployment_start, zbx-agent-services]
9
+  required_for: [post_deployment_end]
10
+  role: ['primary-controller', '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-agent-services
16
+      role: [primary-controller, controller]
17
+  parameters:
18
+    puppet_manifest: puppet/manifests/controller.pp
19
+    puppet_modules: puppet/modules:/etc/puppet/modules
20
+    timeout: 1200
21
+  reexecute_on:
22
+    - deploy_changes

+ 1
- 7
tasks.yaml View File

@@ -1,7 +1 @@
1
-- role: ['primary-controller', 'controller']
2
-  stage: post_deployment/8110
3
-  type: puppet
4
-  parameters:
5
-    puppet_manifest: puppet/manifests/controller.pp
6
-    puppet_modules: puppet/modules:/etc/puppet/modules
7
-    timeout: 1200
1
+[]

Loading…
Cancel
Save