summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Thouvenin <gthouvenin@mirantis.com>2016-08-29 09:02:44 +0200
committerGuillaume Thouvenin <gthouvenin@mirantis.com>2016-09-16 08:21:38 +0000
commitdb94ccbc8c53eebbd62cf14a8cbd166e81494980 (patch)
treed7cce73821338f10e568167bb439852a16f2c0c8
parentd67331c5e9f66c6871308712004776576b832f31 (diff)
Fix a cycle in graph of tasks
This patch removes a dependency that causes a cycle in the graph of tasks in MOS 8. The cycle was <custom>-netconfig -> hosts -> cluster -> virtual_ips -> <custom>-netconfig. We cannot remove hosts.pp as we tried previously because doing this also remove a dependency between globals and hosts. So we create the following dependency: tools -> <custom>-netconfig -> hosts in place of the former: tools -> netconfig -> hosts Change-Id: I9a2ec06e3f61942ad33b9a32d9a6034602a51abd Partial-Bug: #1616391
Notes
Notes (review): Code-Review+2: Simon Pasquier <spasquier@mirantis.com> Code-Review+2: Swann Croiset <scroiset@mirantis.com> Workflow+1: Guillaume Thouvenin <gthouvenin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Sep 2016 08:22:35 +0000 Reviewed-on: https://review.openstack.org/361893 Project: openstack/fuel-plugin-elasticsearch-kibana Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml13
1 files changed, 10 insertions, 3 deletions
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b5b292a..275999e 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -85,12 +85,19 @@
85 reexecute_on: 85 reexecute_on:
86 - deploy_changes 86 - deploy_changes
87 87
88# We cannot use the legacy 'netconfig' task because it won't create the proper 88# We cannot use the legacy 'netconfig' task because with MOS 9, it won't create
89# dependency on the virtual management router task. 89# the proper dependency on the 'virtual_ips' task for the Elasticsearch-Kibana
90# nodes. As a consequence, the deployment will fail because the nodes will
91# perform operations that download stuff from the Internet (like running
92# 'apt-get update') while the virtual router isn't ready yet. For MOS 8, the
93# task depends on the 'tools' task and not on the 'virtual_ips' task otherwise
94# it creates a dependency cycle. In this case, this isn't an issue because the
95# default gateway is only changed at post-deployment (see the
96# 'influxdb-configure-default-route' task).
90- id: elasticsearch-netconfig 97- id: elasticsearch-netconfig
91 type: puppet 98 type: puppet
92 version: 2.0.0 99 version: 2.0.0
93 requires: [elasticsearch-check-configuration, virtual_ips] 100 requires: [elasticsearch-check-configuration, tools]
94 required_for: [deploy_end, hosts] 101 required_for: [deploy_end, hosts]
95 cross-depends: 102 cross-depends:
96 - name: virtual_ips 103 - name: virtual_ips