diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-05-26 10:25:35 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-05-26 10:25:35 -0700 |
| commit | 7eacebafeb9cb66a5a6b1d16c788e192701a039c (patch) | |
| tree | 442108cd6ad323621aa5d5221966316def1e6a8f | |
| parent | 46533ae4281bb58065a8f068c1334e5525deca1f (diff) | |
| parent | 6e9e838a0e9abdf66e3a14bc17e35771bb453966 (diff) | |
| download | puppet-stdlib-7eacebafeb9cb66a5a6b1d16c788e192701a039c.tar.gz puppet-stdlib-7eacebafeb9cb66a5a6b1d16c788e192701a039c.tar.bz2 | |
Merge branch 'bug/master/prefer_stages_after_main'
* bug/master/prefer_stages_after_main:
Move stages to after main
| -rw-r--r-- | manifests/stages.pp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/manifests/stages.pp b/manifests/stages.pp index 19cee6b..365b905 100644 --- a/manifests/stages.pp +++ b/manifests/stages.pp @@ -5,13 +5,13 @@ # The high level stages are (In order): # # * setup -# * deploy +# * main # * runtime # * setup_infra # * deploy_infra -# * main # * setup_app # * deploy_app +# * deploy # # Parameters: # @@ -31,15 +31,12 @@ # class stdlib::stages { - stage { 'setup': before => Stage['deploy'] } - stage { 'deploy': before => Stage['setup_infra'] } - stage { 'runtime': - require => Stage['deploy'], - before => Stage['setup_infra'], - } - stage { 'setup_infra': before => Stage['deploy_infra'] } - stage { 'deploy_infra': before => Stage['main'] } - stage { 'setup_app': require => Stage['main'] } - stage { 'deploy_app': require => Stage['setup_app'] } + stage { 'setup': before => Stage['main'] } + stage { 'runtime': require => Stage['main'] } + -> stage { 'setup_infra': } + -> stage { 'deploy_infra': } + -> stage { 'setup_app': } + -> stage { 'deploy_app': } + -> stage { 'deploy': } } |