diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | Modulefile | 2 | ||||
| -rw-r--r-- | manifests/stages.pp | 21 |
3 files changed, 13 insertions, 13 deletions
@@ -1,3 +1,6 @@ +0.1.4 2011-05-26 Jeff McCune <jeff@puppetlabs.com> +* Move most stages after main + 0.1.3 2011-05-25 Jeff McCune <jeff@puppetlabs.com> * Add validate_re() function @@ -1,5 +1,5 @@ name 'puppetlabs-stdlib' -version '0.1.3' +version '0.1.4' source 'git://github.com/puppetlabs/puppetlabs-stdlib' author 'puppetlabs' license 'Apache' 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': } } |