summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwann Croiset <scroiset@mirantis.com>2016-07-06 13:22:45 +0200
committerSimon Pasquier <spasquier@mirantis.com>2016-07-07 12:29:30 +0000
commitb77f167342758ae3b12b448b996b250a6e770285 (patch)
treed272d1d6b58a1483dc0f11167c75df5028431aaa
parent28afff771aeadca30123bd0f24f8e82b7858b517 (diff)
Fix the deployment order to support MOS 8
Notes
Notes (review): Code-Review+2: Simon Pasquier <spasquier@mirantis.com> Workflow+1: Swann Croiset <scroiset@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 08 Jul 2016 15:08:41 +0000 Reviewed-on: https://review.openstack.org/338917 Project: openstack/fuel-plugin-elasticsearch-kibana Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml27
1 files changed, 14 insertions, 13 deletions
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index decaa30..8f3957f 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -21,8 +21,6 @@
21 - elasticsearch-virtual-ip 21 - elasticsearch-virtual-ip
22 - elasticsearch-haproxy 22 - elasticsearch-haproxy
23 - elasticsearch-installation 23 - elasticsearch-installation
24 - provision-kibana-index
25 - kibana-installation
26 requires: [deploy_start] 24 requires: [deploy_start]
27 required_for: [deploy_end] 25 required_for: [deploy_end]
28 parameters: 26 parameters:
@@ -50,7 +48,6 @@
50 - elasticsearch-virtual-ip 48 - elasticsearch-virtual-ip
51 - elasticsearch-haproxy 49 - elasticsearch-haproxy
52 - elasticsearch-installation 50 - elasticsearch-installation
53 - kibana-installation
54 requires: [deploy_start, primary-elasticsearch_kibana] 51 requires: [deploy_start, primary-elasticsearch_kibana]
55 required_for: [deploy_end] 52 required_for: [deploy_end]
56 parameters: 53 parameters:
@@ -158,13 +155,19 @@
158 reexecute_on: 155 reexecute_on:
159 - deploy_changes 156 - deploy_changes
160 157
161# In order to automatically import dashboards, this is mandatory to create and 158# Tasks defintions for the post-deployment
162# configure the Kibana index before Kibana4 starts. 159##########################################
160
161# In order to automatically import dashboards, it is mandatory to create and
162# configure the Kibana index before Kibana4 starts. This task is ran at post-deployment
163# stage because the index creation must occur when the Elasticsearch cluster is ready
164# (eg. all instances are started). This is required for MOS 8 (role-based deployment).
163- id: provision-kibana-index 165- id: provision-kibana-index
164 type: puppet 166 type: puppet
165 version: 2.0.0 167 version: 2.0.0
166 requires: [elasticsearch-installation] 168 role: [primary-elasticsearch_kibana]
167 required_for: [deploy_end] 169 requires: [post_deployment_start]
170 required_for: [post_deployment_end]
168 parameters: 171 parameters:
169 puppet_manifest: puppet/manifests/kibana_index_configuration.pp 172 puppet_manifest: puppet/manifests/kibana_index_configuration.pp
170 puppet_modules: puppet/modules:/etc/puppet/modules 173 puppet_modules: puppet/modules:/etc/puppet/modules
@@ -173,19 +176,17 @@
173- id: kibana-installation 176- id: kibana-installation
174 type: puppet 177 type: puppet
175 version: 2.0.0 178 version: 2.0.0
179 role: [primary-elasticsearch_kibana, elasticsearch_kibana]
176 cross-depends: 180 cross-depends:
177 - name: provision-kibana-index 181 - name: provision-kibana-index
178 role: [primary-elasticsearch_kibana] 182 role: [primary-elasticsearch_kibana]
179 requires: [elasticsearch-installation, provision-kibana-index] 183 requires: [post_deployment_start, provision-kibana-index]
180 required_for: [deploy_end] 184 required_for: [post_deployment_end]
181 parameters: 185 parameters:
182 puppet_manifest: puppet/manifests/kibana.pp 186 puppet_manifest: puppet/manifests/kibana.pp
183 puppet_modules: puppet/modules:/etc/puppet/modules 187 puppet_modules: puppet/modules:/etc/puppet/modules
184 timeout: 600 188 timeout: 600
185 189
186# Tasks defintions for the post-deployment
187##########################################
188
189# This task needs to be reexecuted to reconfigure the index templates with an 190# This task needs to be reexecuted to reconfigure the index templates with an
190# appropriate number_of_replicas. 191# appropriate number_of_replicas.
191# This is done at post_deployment time to ensure that the cluster is ready. 192# This is done at post_deployment time to ensure that the cluster is ready.
@@ -193,7 +194,7 @@
193 type: puppet 194 type: puppet
194 version: 2.0.0 195 version: 2.0.0
195 role: [primary-elasticsearch_kibana] 196 role: [primary-elasticsearch_kibana]
196 requires: [post_deployment_start] 197 requires: [post_deployment_start, kibana-installation]
197 # We use upload_nodes_info as an anchor to order the post-deployment tasks executed 198 # We use upload_nodes_info as an anchor to order the post-deployment tasks executed
198 # by this plugin and the LMA collector plugin. The dependency chain is like this: 199 # by this plugin and the LMA collector plugin. The dependency chain is like this:
199 # elasticsearch-kibana-configuration -> upload_nodes_info -> (LMA collector tasks) 200 # elasticsearch-kibana-configuration -> upload_nodes_info -> (LMA collector tasks)