Merge "Revert "Fix task dependencies for provision and deletion graphs"" into stable/newton

graphs/deletion/tasks.yaml

@@ -35,10 +35,8 @@
   type: reboot
   version: 2.1.0
   role: ['/.*/']
+  requires: [reconfigure_dhcpd]
   required_for: [node_erase]
-  cross-depends:
-    - name: reconfigure_dhcpd
-      role: master
   parameters:
     timeout: 300
 

graphs/provision/tasks.yaml

@@ -60,10 +60,8 @@
   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
@@ -74,7 +72,7 @@
   type: shell
   version: 2.1.0
   role: ['/.*/']
-  requires: [upload_provision_info]
+  requires: [provision_master, upload_provision_info]
   required_for: [node_reboot]
   cross-depends:
     - name: build_deploy_image