Prioritize tasks

Use priority numbers instead of require definition to order tasks
execution.

Change-Id: I93d4feb92aeaa69711629165354322bb38d56445
This commit is contained in:
Michal Skalski 2015-06-26 11:39:27 +02:00
parent 206d07f45e
commit f9c59a9c00
1 changed files with 11 additions and 19 deletions

View File

@ -1,14 +1,14 @@
- id: odl_install - id: odl_install
role: ['primary-controller'] role: ['primary-controller']
stage: pre_deployment stage: pre_deployment/4450
type: puppet type: puppet
parameters: parameters:
puppet_manifest: puppet/manifests/controller-pre.pp puppet_manifest: puppet/manifests/controller-pre.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720 timeout: 720
- id: odl_conifgure - id: odl_configure
role: ['primary-controller', 'controller', 'compute'] role: ['primary-controller', 'controller', 'compute']
stage: post_deployment stage: post_deployment/4455
type: puppet type: puppet
parameters: parameters:
puppet_manifest: puppet/manifests/odl-service.pp puppet_manifest: puppet/manifests/odl-service.pp
@ -16,71 +16,63 @@
timeout: 720 timeout: 720
- id: odl_delete_predefined_net - id: odl_delete_predefined_net
role: ['primary-controller'] role: ['primary-controller']
stage: post_deployment stage: post_deployment/4460
type: shell type: shell
requires: [odl_configure]
parameters: parameters:
cmd: ./clean-neutron.sh cmd: ./clean-neutron.sh
timeout: 120 timeout: 120
- id: odl_disable_ovs_agent - id: odl_disable_ovs_agent
role: ['primary-controller', 'compute'] role: ['primary-controller', 'compute']
stage: post_deployment stage: post_deployment/4465
type: puppet type: puppet
requires: [odl_delete_predefined_net]
parameters: parameters:
puppet_manifest: puppet/manifests/disable-ovs-agent.pp puppet_manifest: puppet/manifests/disable-ovs-agent.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_stop_neutron - id: odl_stop_neutron
role: ['primary-controller', 'controller'] role: ['primary-controller', 'controller']
stage: post_deployment stage: post_deployment/4470
type: puppet type: puppet
requires: [odl_delete_predefined_net]
parameters: parameters:
puppet_manifest: puppet/manifests/stop-neutron.pp puppet_manifest: puppet/manifests/stop-neutron.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_recreate_ovs - id: odl_recreate_ovs
role: ['primary-controller', 'controller', 'compute'] role: ['primary-controller', 'controller', 'compute']
stage: post_deployment stage: post_deployment/4475
type: puppet type: puppet
requires: [odl_stop_neutron]
parameters: parameters:
puppet_manifest: puppet/manifests/recreate-ovs.pp puppet_manifest: puppet/manifests/recreate-ovs.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_ml2_configuration - id: odl_ml2_configuration
role: ['primary-controller', 'controller', 'compute'] role: ['primary-controller', 'controller', 'compute']
stage: post_deployment stage: post_deployment/4480
type: puppet type: puppet
requires: [odl_recreate_ovs]
parameters: parameters:
puppet_manifest: puppet/manifests/ml2-configuration.pp puppet_manifest: puppet/manifests/ml2-configuration.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_recreate_neutron_db - id: odl_recreate_neutron_db
role: ['primary-controller'] role: ['primary-controller']
stage: post_deployment stage: post_deployment/4485
type: puppet type: puppet
requires: [odl_ml2_configuration]
parameters: parameters:
puppet_manifest: puppet/manifests/recreate-neutron-db.pp puppet_manifest: puppet/manifests/recreate-neutron-db.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_setup_floating - id: odl_setup_floating
role: ['primary-controller', 'controller'] role: ['primary-controller', 'controller']
stage: post_deployment stage: post_deployment/4490
type: puppet type: puppet
requires: [odl_recreate_neutron_db]
parameters: parameters:
puppet_manifest: puppet/manifests/setup-floating.pp puppet_manifest: puppet/manifests/setup-floating.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 60 timeout: 60
- id: odl_start_neutron - id: odl_start_neutron
role: ['primary-controller', 'controller'] role: ['primary-controller', 'controller']
stage: post_deployment stage: post_deployment/4495
type: puppet type: puppet
requires: [odl_setup_floating]
parameters: parameters:
puppet_manifest: puppet/manifests/start-neutron.pp puppet_manifest: puppet/manifests/start-neutron.pp
puppet_modules: puppet/modules:/etc/puppet/modules puppet_modules: puppet/modules:/etc/puppet/modules