Browse Source

Fix the deployment order to support MOS 8

Closes-bug: #1599554

Change-Id: Id8b73d15e0ca4fbec63e9bc9049d7206f8ae850b
tags/0.10.0
Swann Croiset 3 years ago
parent
commit
b77f167342
1 changed files with 14 additions and 13 deletions
  1. 14
    13
      deployment_tasks.yaml

+ 14
- 13
deployment_tasks.yaml View File

@@ -21,8 +21,6 @@
21 21
     - elasticsearch-virtual-ip
22 22
     - elasticsearch-haproxy
23 23
     - elasticsearch-installation
24
-    - provision-kibana-index
25
-    - kibana-installation
26 24
   requires: [deploy_start]
27 25
   required_for: [deploy_end]
28 26
   parameters:
@@ -50,7 +48,6 @@
50 48
     - elasticsearch-virtual-ip
51 49
     - elasticsearch-haproxy
52 50
     - elasticsearch-installation
53
-    - kibana-installation
54 51
   requires: [deploy_start, primary-elasticsearch_kibana]
55 52
   required_for: [deploy_end]
56 53
   parameters:
@@ -158,13 +155,19 @@
158 155
   reexecute_on:
159 156
     - deploy_changes
160 157
 
161
-# In order to automatically import dashboards, this is mandatory to create and
162
-# configure the Kibana index before Kibana4 starts.
158
+# Tasks defintions for the post-deployment
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 165
 - id: provision-kibana-index
164 166
   type: puppet
165 167
   version: 2.0.0
166
-  requires: [elasticsearch-installation]
167
-  required_for: [deploy_end]
168
+  role: [primary-elasticsearch_kibana]
169
+  requires: [post_deployment_start]
170
+  required_for: [post_deployment_end]
168 171
   parameters:
169 172
     puppet_manifest: puppet/manifests/kibana_index_configuration.pp
170 173
     puppet_modules: puppet/modules:/etc/puppet/modules
@@ -173,19 +176,17 @@
173 176
 - id: kibana-installation
174 177
   type: puppet
175 178
   version: 2.0.0
179
+  role: [primary-elasticsearch_kibana, elasticsearch_kibana]
176 180
   cross-depends:
177 181
     - name: provision-kibana-index
178 182
       role: [primary-elasticsearch_kibana]
179
-  requires: [elasticsearch-installation, provision-kibana-index]
180
-  required_for: [deploy_end]
183
+  requires: [post_deployment_start, provision-kibana-index]
184
+  required_for: [post_deployment_end]
181 185
   parameters:
182 186
     puppet_manifest: puppet/manifests/kibana.pp
183 187
     puppet_modules: puppet/modules:/etc/puppet/modules
184 188
     timeout: 600
185 189
 
186
-# Tasks defintions for the post-deployment
187
-##########################################
188
-
189 190
 # This task needs to be reexecuted to reconfigure the index templates with an
190 191
 # appropriate number_of_replicas.
191 192
 # This is done at post_deployment time to ensure that the cluster is ready.
@@ -193,7 +194,7 @@
193 194
   type: puppet
194 195
   version: 2.0.0
195 196
   role: [primary-elasticsearch_kibana]
196
-  requires: [post_deployment_start]
197
+  requires: [post_deployment_start, kibana-installation]
197 198
   # We use upload_nodes_info as an anchor to order the post-deployment tasks executed
198 199
   # by this plugin and the LMA collector plugin. The dependency chain is like this:
199 200
   # elasticsearch-kibana-configuration -> upload_nodes_info -> (LMA collector tasks)

Loading…
Cancel
Save