Merge branch 'bug/master/prefer_stages_after_main'

* bug/master/prefer_stages_after_main:
  Move stages to after main
This commit is contained in:
Jeff McCune 2011-05-26 10:25:35 -07:00
commit 7eacebafeb

View file

@ -5,13 +5,13 @@
# The high level stages are (In order): # The high level stages are (In order):
# #
# * setup # * setup
# * deploy # * main
# * runtime # * runtime
# * setup_infra # * setup_infra
# * deploy_infra # * deploy_infra
# * main
# * setup_app # * setup_app
# * deploy_app # * deploy_app
# * deploy
# #
# Parameters: # Parameters:
# #
@ -31,15 +31,12 @@
# #
class stdlib::stages { class stdlib::stages {
stage { 'setup': before => Stage['deploy'] } stage { 'setup': before => Stage['main'] }
stage { 'deploy': before => Stage['setup_infra'] } stage { 'runtime': require => Stage['main'] }
stage { 'runtime': -> stage { 'setup_infra': }
require => Stage['deploy'], -> stage { 'deploy_infra': }
before => Stage['setup_infra'], -> stage { 'setup_app': }
} -> stage { 'deploy_app': }
stage { 'setup_infra': before => Stage['deploy_infra'] } -> stage { 'deploy': }
stage { 'deploy_infra': before => Stage['main'] }
stage { 'setup_app': require => Stage['main'] }
stage { 'deploy_app': require => Stage['setup_app'] }
} }