Merge "Revert "Fix task dependencies for provision and deletion graphs"" into stable/newton
This commit is contained in:
commit
49f8513de4
|
@ -35,10 +35,8 @@
|
||||||
type: reboot
|
type: reboot
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
role: ['/.*/']
|
role: ['/.*/']
|
||||||
|
requires: [reconfigure_dhcpd]
|
||||||
required_for: [node_erase]
|
required_for: [node_erase]
|
||||||
cross-depends:
|
|
||||||
- name: reconfigure_dhcpd
|
|
||||||
role: master
|
|
||||||
parameters:
|
parameters:
|
||||||
timeout: 300
|
timeout: 300
|
||||||
|
|
||||||
|
|
|
@ -60,10 +60,8 @@
|
||||||
type: upload_file
|
type: upload_file
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
role: ['/.*/']
|
role: ['/.*/']
|
||||||
|
requires: [provision_master]
|
||||||
required_for: [system_provision]
|
required_for: [system_provision]
|
||||||
cross-depends:
|
|
||||||
- name: provision_master
|
|
||||||
role: master
|
|
||||||
parameters:
|
parameters:
|
||||||
path: /tmp/provision.json
|
path: /tmp/provision.json
|
||||||
timeout: 180
|
timeout: 180
|
||||||
|
@ -74,7 +72,7 @@
|
||||||
type: shell
|
type: shell
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
role: ['/.*/']
|
role: ['/.*/']
|
||||||
requires: [upload_provision_info]
|
requires: [provision_master, upload_provision_info]
|
||||||
required_for: [node_reboot]
|
required_for: [node_reboot]
|
||||||
cross-depends:
|
cross-depends:
|
||||||
- name: build_deploy_image
|
- name: build_deploy_image
|
||||||
|
|
Loading…
Reference in New Issue