summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-07-26 08:34:21 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-07-26 08:37:48 +0200
commit8c6f239ec4786d83693627b627faf4ac7803d1b3 (patch)
tree99a23809ce42c96abc68bdb4ebdf938e229172ec
parent704cd712521973769e639c7e85fb022c8d462a35 (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:03:19 +0000 Reviewed-on: https://review.openstack.org/347142 Project: openstack/fuel-plugin-zabbix-snmptrapd Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml24
-rw-r--r--tasks.yaml8
2 files changed, 23 insertions, 9 deletions
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index fe92594..3f05c06 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,2 +1,22 @@
1--- 1- id: zbx-configure-snmptrapd-services
2[] 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
diff --git a/tasks.yaml b/tasks.yaml
index 87638fe..fe51488 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -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