Gehel has submitted this change and it was merged. Change subject: elasticsearch cirrus - align configuration for deployment-prep ......................................................................
elasticsearch cirrus - align configuration for deployment-prep While renaming elasticsearch roles, deplyoment-prep was not taken into account. Heap size need to be externalized for deployment-prep. See also: https://gerrit.wikimedia.org/r/#/c/304067/ Change-Id: I8709b8d359bc2969b4407d5c56a8d08fa4d0cdcd --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/elasticsearch/cirrus.yaml M modules/role/manifests/elasticsearch/common.pp 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Gehel: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index c576fb7..c143946 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -195,7 +195,6 @@ - deployment-elastic07 - deployment-elastic08 "elasticsearch::cluster_name": beta-search -"elasticsearch::auto_create_index": '+apifeatureusage-*,-*' "elasticsearch::graylog_hosts": - deployment-logstash2.deployment-prep.eqiad.wmflabs role::logstash::statsd_host: labmon1001.eqiad.wmnet diff --git a/hieradata/role/common/elasticsearch/cirrus.yaml b/hieradata/role/common/elasticsearch/cirrus.yaml index d82740d..04be0cb 100644 --- a/hieradata/role/common/elasticsearch/cirrus.yaml +++ b/hieradata/role/common/elasticsearch/cirrus.yaml @@ -3,6 +3,9 @@ admin::groups: - elasticsearch-roots +# More than 30G isn't very useful +elasticsearch::heap_memory: '30G' + # Nodes should not be master eligible by default in prod elasticsearch::master_eligible: false diff --git a/modules/role/manifests/elasticsearch/common.pp b/modules/role/manifests/elasticsearch/common.pp index 6613cba..c95c497 100644 --- a/modules/role/manifests/elasticsearch/common.pp +++ b/modules/role/manifests/elasticsearch/common.pp @@ -50,8 +50,6 @@ # Install class { '::elasticsearch': require => Package['elasticsearch/plugins'], - # More than 30G isn't very useful - heap_memory => '30G', # Production elasticsearch needs these plugins to be loaded in order # to work properly. This will keep elasticsearch from starting # if these plugins are not available. -- To view, visit https://gerrit.wikimedia.org/r/308529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8709b8d359bc2969b4407d5c56a8d08fa4d0cdcd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <[email protected]> Gerrit-Reviewer: DCausse <[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
