Permalink
Browse files

more anchor patterns fixes and some repo mgmt

  • Loading branch information...
1 parent 551d1c2 commit 4b15445f5b7df04ab8e941bde28aea7fee68b96a @haf haf committed Oct 26, 2012
Showing with 15 additions and 38 deletions.
  1. +1 −0 .gitignore
  2. +0 −23 .project
  3. +9 −12 manifests/appconfig.pp
  4. +1 −1 manifests/init.pp
  5. +4 −2 manifests/vmargs.pp
View
@@ -9,3 +9,4 @@ Gemfile.lock
files/packages/
graphs/
metadata.json
+.project
View
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>puppet-riak</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
View
@@ -134,16 +134,18 @@
default => $source,
}
- anchor { 'riak::appconfig::start': } ->
+ anchor { 'riak::appconfig::start': }
file { [
$appcfg[riak_core][platform_log_dir],
$appcfg[riak_core][platform_lib_dir],
$appcfg[riak_core][platform_data_dir],
]:
- ensure => directory,
- mode => '0755',
- owner => 'riak',
+ ensure => directory,
+ mode => '0755',
+ owner => 'riak',
+ require => Anchor['riak::appconfig::start'],
+ before => Anchor['riak::appconfig::end'],
}
file { "${$appcfg[riak_core][platform_etc_dir]}/app.config":
@@ -154,15 +156,10 @@
File["${$appcfg[riak_core][platform_log_dir]}"],
File["${$appcfg[riak_core][platform_lib_dir]}"],
File["${$appcfg[riak_core][platform_data_dir]}"],
+ Anchor['riak::appconfig::start'],
],
+ before => Anchor['riak::appconfig::end'],
}
- anchor { 'riak::appconfig::end':
- require => [
- File["${$appcfg[riak_core][platform_etc_dir]}/app.config"],
- File["${$appcfg[riak_core][platform_log_dir]}"],
- File["${$appcfg[riak_core][platform_lib_dir]}"],
- File["${$appcfg[riak_core][platform_data_dir]}"],
- ],
- }
+ anchor { 'riak::appconfig::end': }
}
View
@@ -143,7 +143,7 @@
}
if $use_repos == true {
- package { 'riak':
+ package { $package:
ensure => $manage_package,
require => [
Class[riak::config],
View
@@ -47,13 +47,15 @@
default => $source,
}
- anchor { 'riak::vmargs::start': } ->
+ anchor { 'riak::vmargs::start': }
file { '/etc/riak/vm.args':
ensure => $manage_file,
content => $manage_template,
source => $manage_source,
- } ->
+ require => Anchor['riak::vmargs::start'],
+ before => Anchor['riak::vmargs::end'],
+ }
anchor { 'riak::vmargs::end': }
}

0 comments on commit 4b15445

Please sign in to comment.