EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341372 )
Change subject: deployment-prep: Use elasticsearch 5.x
......................................................................
deployment-prep: Use elasticsearch 5.x
Updates deployment prep to specify elasticsearch v5, and adjusts
hiera handling to enable the experimental apt repo for deployment-prep
elasticsearch installations.
Change-Id: I7420ea1cba88e30794d9bcecf009cab4860bc79f
---
A hieradata/labs/common/elasticsearch/cirrus.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/puppetmaster/files/labs.hiera.yaml
3 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/341372/1
diff --git a/hieradata/labs/common/elasticsearch/cirrus.yaml
b/hieradata/labs/common/elasticsearch/cirrus.yaml
new file mode 100644
index 0000000..976eb13
--- /dev/null
+++ b/hieradata/labs/common/elasticsearch/cirrus.yaml
@@ -0,0 +1,5 @@
+# use elasticsearch 5, which is only available in experimental at the moment.
+# once all elasticsearch clusters are upgraded to version 5, we will move
+# elasticsearch to our main repo and remove this configuration
+apt::use_experimental: true
+
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 7b7981a..4009b6d 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -187,7 +187,7 @@
"mediawiki::users::mwdeploy_pub_key": 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQDFwlmBBBJAr1GI+vuYjFh5vq0YIVa5fqE5DZdpzUZISlQ0Kt+9bIr2qNHIj+Jl5Bc6ZY1mkh8l693tAHVx+8tayoiFWYNs9IVsxR+iHgOOhAdDIBXaHaUattdiye5bQmdvJVXaVegckNX2gbmUCOc09jvZvlk3blKFTSEpZRU8dmpXQzKdZgaAq2VTajAegoFnuN9FbC7hzBPA+1NxFNKn94eIeFPSlo5rWr44OEb5Uy3O0B5c6WPM+IgfiygetP+yGL4cKv7qEjZ0Sxok/Rh1lBh1vP1YQ/Mc6tMV0s+kOv7Wz+P88bfU1/uWvy479OZdfh3NQqDTrLzqHwVW1vef
root@deployment-salt'
# NOTE: these elasticsearch settings will need to be overloaded on a per-host
# basis for the Logstash Elasticsearch cluster.
-"elasticsearch::version": 2
+"elasticsearch::version": 5
"elasticsearch::expected_nodes": 3
"elasticsearch::minimum_master_nodes": 2
"elasticsearch::heap_memory": 4G
diff --git a/modules/puppetmaster/files/labs.hiera.yaml
b/modules/puppetmaster/files/labs.hiera.yaml
index 5a1fa0d..9b67ce1 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -26,3 +26,6 @@
- "secret/common"
- "private/common"
- "httpyaml/%{::labsproject}/node/%{::fqdn}"
+:role_hierarchy:
+ - "labs/common"
+ - "common"
--
To view, visit https://gerrit.wikimedia.org/r/341372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7420ea1cba88e30794d9bcecf009cab4860bc79f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
