The introduction of an nginx instance to ::elasticsearch for T124444: Look into encrypting Elasticsearch traffic conflicts with the existing nginx reverse proxy implemented for T120040: Setup an experimental, user accessible (read+write) ES cluster for Tool Labs.
Description
Description
Details
Details
| Subject | Repo | Branch | Lines +/- | |
|---|---|---|---|---|
| Moving elasticsearch::https instatiation to elasticsearch role | operations/puppet | production | +2 -8 |
Related Objects
Related Objects
Event Timeline
Comment Actions
Change 281824 had a related patch set uploaded (by BryanDavis):
Moving elasticsearch::https instatiation to elasticsearch role
Comment Actions
This has been temporarily hacked around with this local patch on tools-puppetmaster-01:
commit e7789171b6efe3b828738ea9b638c571a427a48e
Author: Bryan Davis <bd808@wikimedia.org>
Date: Tue Apr 5 21:22:34 2016 +0000
[HACK] Disable elasticsaerch::https
Needs to be fixed upstream by moving to a role or something
diff --git a/modules/elasticsearch/manifests/init.pp b/modules/elasticsearch/manifests/init.pp
index 80eb707..3159c2e 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -115,7 +115,8 @@ class elasticsearch($cluster_name,
}
include ::elasticsearch::packages
- include ::elasticsearch::https
+ # bd808: Breaks stuff in tool labs
+ # include ::elasticsearch::https
file { '/etc/elasticsearch/elasticsearch.yml':
ensure => file,@Gehel has a patch up for review in gerrit that will provide a better fix by moving the use of ::elasticsearch::https from ::elasticsearch to ::role::elasticsearch::server. Once that lands we will need to pull the local hack patch from tools-puppetmaster-01.
Comment Actions
Change 281824 merged by Gehel:
Moving elasticsearch::https instatiation to elasticsearch role
Comment Actions
As I don't have acccess to tools-puppetmaster-01, I'll let you do the cleanup (access requested, we'll see if I get it before you clean my mess).
Comment Actions
Mentioned in SAL [2016-04-06T15:20:16Z] <bd808> Removed local hack for T131906 from tools-puppetmaster-01