Revert "upgrade to elasticsearch/elasticsearch 0.9.6"

[dsa-puppet.git] / 3rdparty / modules / elasticsearch / manifests / init.pp

diff --git a/3rdparty/modules/elasticsearch/manifests/init.pp b/3rdparty/modules/elasticsearch/manifests/init.pp
index 20ff72293af23c2011d7835d54ae66e6e8ba04ec..9b7b40d294dde21689989238a6849e569cf72b2b 100644 (file)
--- a/3rdparty/modules/elasticsearch/manifests/init.pp
+++ b/3rdparty/modules/elasticsearch/manifests/init.pp
@@ -163,12 +163,6 @@
 #   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.
@@ -203,7 +197,6 @@ 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,
@@ -234,6 +227,7 @@ class elasticsearch(
 ) inherits elasticsearch::params {
 
   anchor {'elasticsearch::begin': }
+  anchor {'elasticsearch::end': }
 
 
   #### Validate parameters
@@ -336,7 +330,7 @@ class elasticsearch(
       distribution => 'jre',
     }
 
-    # ensure we first install java, the package and then the rest
+    # ensure we first java java and then manage the service
     Anchor['elasticsearch::begin']
     -> Class['::java']
     -> Class['elasticsearch::package']
@@ -379,12 +373,10 @@ class elasticsearch(
     -> Class['elasticsearch::config']
     -> Elasticsearch::Instance <| |>
     -> Elasticsearch::Template <| |>
-
   } else {
 
     # make sure all services are getting stopped before software removal
-    Anchor['elasticsearch::begin']
-    -> Elasticsearch::Instance <| |>
+    Elasticsearch::Instance <| |>
     -> Class['elasticsearch::config']
     -> Class['elasticsearch::package']