From 399611521195d75225a4cbf5613739bec5798fd0 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 21 Mar 2017 18:55:54 +0300 Subject: [PATCH] Fix task dependencies for provision and deletion graphs Change-Id: I375f9ad6716c4e5eff76d30b74fc591e0c0ea71d Implements: blueprint get-rid-cobbler-dnsmasq --- graphs/deletion/tasks.yaml | 4 +++- graphs/provision/tasks.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/graphs/deletion/tasks.yaml b/graphs/deletion/tasks.yaml index 2fd0188507..a725ddaf9d 100644 --- a/graphs/deletion/tasks.yaml +++ b/graphs/deletion/tasks.yaml @@ -35,8 +35,10 @@ type: reboot version: 2.1.0 role: ['/.*/'] - requires: [reconfigure_dhcpd] required_for: [node_erase] + cross-depends: + - name: reconfigure_dhcpd + role: master parameters: timeout: 300 diff --git a/graphs/provision/tasks.yaml b/graphs/provision/tasks.yaml index 14941768fa..8a5c45e3ed 100644 --- a/graphs/provision/tasks.yaml +++ b/graphs/provision/tasks.yaml @@ -60,8 +60,10 @@ type: upload_file version: 2.1.0 role: ['/.*/'] - requires: [provision_master] required_for: [system_provision] + cross-depends: + - name: provision_master + role: master parameters: path: /tmp/provision.json timeout: 180 @@ -72,7 +74,7 @@ type: shell version: 2.1.0 role: ['/.*/'] - requires: [provision_master, upload_provision_info] + requires: [upload_provision_info] required_for: [node_reboot] cross-depends: - name: build_deploy_image