X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Felasticsearch%2Fmanifests%2Finit.pp;h=20ff72293af23c2011d7835d54ae66e6e8ba04ec;hb=8efe10c37b152ebbf7fd051ea13ddd2b06d43e77;hp=be92dd5dbef037cdd6766ced503342f4b27e7a8c;hpb=47e66c55978a019774cdbfa777be7bbcec325863;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/elasticsearch/manifests/init.pp b/3rdparty/modules/elasticsearch/manifests/init.pp
index be92dd5db..20ff72293 100644
--- a/3rdparty/modules/elasticsearch/manifests/init.pp
+++ b/3rdparty/modules/elasticsearch/manifests/init.pp
@@ -163,6 +163,12 @@
 #   Enable Hiera's merging function for the plugins
 #   Defaults to: false
 #
+# [*package_pin*]
+#   Enables package version pinning.
+#   This pins the package version to the set version number and avoids
+#   package upgrades.
+#   Defaults to: true
+#
 # The default values for the parameters are set in elasticsearch::params. Have
 # a look at the corresponding <tt>params.pp</tt> manifest file if you need more
 # technical information about them.
@@ -197,6 +203,7 @@ class elasticsearch(
   $package_url           = undef,
   $package_dir           = $elasticsearch::params::package_dir,
   $package_name          = $elasticsearch::params::package,
+  $package_pin           = true,
   $purge_package_dir     = $elasticsearch::params::purge_package_dir,
   $package_dl_timeout    = $elasticsearch::params::package_dl_timeout,
   $elasticsearch_user    = $elasticsearch::params::elasticsearch_user,
@@ -227,7 +234,6 @@ class elasticsearch(
 ) inherits elasticsearch::params {
 
   anchor {'elasticsearch::begin': }
-  anchor {'elasticsearch::end': }
 
 
   #### Validate parameters
@@ -327,10 +333,10 @@ class elasticsearch(
     # Install java
     class { '::java':
       package      => $java_package,
-      distribution => 'jre'
+      distribution => 'jre',
     }
 
-    # ensure we first java java and then manage the service
+    # ensure we first install java, the package and then the rest
     Anchor['elasticsearch::begin']
     -> Class['::java']
     -> Class['elasticsearch::package']
@@ -358,7 +364,7 @@ class elasticsearch(
       }
 
       class { 'elasticsearch::repo':
-        stage => $repo_stage
+        stage => $repo_stage,
       }
     }
   }
@@ -373,10 +379,12 @@ class elasticsearch(
     -> Class['elasticsearch::config']
     -> Elasticsearch::Instance <| |>
     -> Elasticsearch::Template <| |>
+
   } else {
 
     # make sure all services are getting stopped before software removal
-    Elasticsearch::Instance <| |>
+    Anchor['elasticsearch::begin']
+    -> Elasticsearch::Instance <| |>
     -> Class['elasticsearch::config']
     -> Class['elasticsearch::package']