Gehel has submitted this change and it was merged.
Change subject: Moving elasticsearch::https instatiation to elasticsearch role
......................................................................
Moving elasticsearch::https instatiation to elasticsearch role
This will ensure that other roles requiring elasticsearch do not have any
conflicts with the dependencies that elasticsearch brings.
Bug: T131906
Change-Id: I84bcec99bf0cb9c9515de027240bd685d7a62585
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
M hieradata/role/common/elasticsearch/server.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
M modules/elasticsearch/manifests/https.pp
M modules/elasticsearch/manifests/init.pp
M modules/role/manifests/elasticsearch/server.pp
7 files changed, 2 insertions(+), 8 deletions(-)
Approvals:
Gehel: Looks good to me, approved
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 8510cbc..92d06e0 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -177,7 +177,6 @@
"elasticsearch::auto_create_index": '+apifeatureusage-*,-*'
"elasticsearch::graylog_hosts":
- deployment-logstash2.deployment-prep.eqiad.wmflabs
-"elasticsearch::https::ensure": present
role::logstash::statsd_host: labmon1001.eqiad.wmnet
"mediawiki::redis_servers::eqiad":
shard01:
diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
index c6835aa..766d4fc 100644
--- a/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
@@ -13,7 +13,6 @@
# Needed to keep from trying to join cirrussearch cluster
elasticsearch::unicast_hosts:
- deployment-logstash2.deployment-prep.eqiad.wmflabs
-elasticsearch::https::ensure: absent
elasticsearch::auto_create_index: '+logstash-*,-*'
# Logstash specific
diff --git a/hieradata/role/common/elasticsearch/server.yaml
b/hieradata/role/common/elasticsearch/server.yaml
index b0a967e..8593838 100644
--- a/hieradata/role/common/elasticsearch/server.yaml
+++ b/hieradata/role/common/elasticsearch/server.yaml
@@ -35,7 +35,5 @@
# actual searches
elasticsearch::merge_threads: 1
-elasticsearch::https::ensure: 'present'
-
# T130329
base::monitoring::host::nrpe_check_disk_options: -w 18% -c 15% -l -e -A -i
"/srv/sd[a-b][1-3]" --exclude-type=tracefs
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml
b/hieradata/role/common/logstash/elasticsearch.yaml
index 0e7d493..64f5858 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -29,5 +29,3 @@
debdeploy::grains:
debdeploy-logstash:
value: standard
-
-elasticsearch::https::ensure: 'absent'
diff --git a/modules/elasticsearch/manifests/https.pp
b/modules/elasticsearch/manifests/https.pp
index 3a8b988..bdf673f 100644
--- a/modules/elasticsearch/manifests/https.pp
+++ b/modules/elasticsearch/manifests/https.pp
@@ -12,7 +12,7 @@
# unless the service is accessed directly by FQDN.
class elasticsearch::https (
- $ensure = absent,
+ $ensure = present,
$certificate_name = $::fqdn,
){
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 80eb707..53e643b 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -115,7 +115,6 @@
}
include ::elasticsearch::packages
- include ::elasticsearch::https
file { '/etc/elasticsearch/elasticsearch.yml':
ensure => file,
diff --git a/modules/role/manifests/elasticsearch/server.pp
b/modules/role/manifests/elasticsearch/server.pp
index 0ef61e9..99972fb 100644
--- a/modules/role/manifests/elasticsearch/server.pp
+++ b/modules/role/manifests/elasticsearch/server.pp
@@ -59,6 +59,7 @@
include ::elasticsearch::ganglia
}
+ include ::elasticsearch::https
include elasticsearch::monitor::diamond
include ::elasticsearch::log::hot_threads
include ::elasticsearch::nagios::check
--
To view, visit https://gerrit.wikimedia.org/r/281824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84bcec99bf0cb9c9515de027240bd685d7a62585
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
