more anchor patterns fixes and some repo mgmt

basho-labs · Oct 26, 2012 · 4b15445 · 4b15445
1 parent 551d1c2
commit 4b15445
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ Gemfile.lock
 files/packages/
 graphs/
 metadata.json
+.project
diff --git a/.project b/.project
diff --git a/manifests/appconfig.pp b/manifests/appconfig.pp
@@ -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': }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -143,7 +143,7 @@
   }
 
   if $use_repos == true {
-    package { 'riak':
+    package { $package:
       ensure  => $manage_package,
       require => [
         Class[riak::config],

diff --git a/manifests/vmargs.pp b/manifests/vmargs.pp
@@ -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': }
 }