Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/352605 )
Change subject: elastic - simplify configuration of elastic.co reprepro repositories ...................................................................... elastic - simplify configuration of elastic.co reprepro repositories Now that most elastic.co packages are available form the same repo, it is possible to merge their configurations. This also helps making sure we keep the ELK components at the same version. Bug: T161908 Change-Id: I412713647ccacf9d70bc2bafd80f52640fad4daf --- M modules/aptrepo/files/distributions-wikimedia M modules/aptrepo/files/updates 2 files changed, 4 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/352605/1 diff --git a/modules/aptrepo/files/distributions-wikimedia b/modules/aptrepo/files/distributions-wikimedia index 62bc9f5..40d0517 100644 --- a/modules/aptrepo/files/distributions-wikimedia +++ b/modules/aptrepo/files/distributions-wikimedia @@ -6,7 +6,7 @@ Architectures: source amd64 i386 Components: main universe non-free thirdparty thirdparty/cloudera UDebComponents: main -Update: hwraid cloudera-trusty elasticsearch logstash hp-mcp-trusty confluent +Update: hwraid cloudera-trusty elastic hp-mcp-trusty confluent Description: Wikimedia specific packages for Ubuntu Trusty Tahr SignWith: 09DBD9F93F6CD44A DebOverride: deb-override @@ -22,7 +22,7 @@ Architectures: source amd64 i386 Components: main backports thirdparty experimental thirdparty/cloudera UDebComponents: main backports thirdparty experimental -Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent kibana elasticsearch elasticsearch-curator docker jenkins +Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent elastic elasticsearch-curator docker jenkins Description: Wikimedia packages for Debian Jessie SignWith: 09DBD9F93F6CD44A DebOverride: deb-override diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates index d3f1412..95e4c16 100644 --- a/modules/aptrepo/files/updates +++ b/modules/aptrepo/files/updates @@ -65,7 +65,7 @@ VerifyRelease: 749D6EEC0353B12C|A278B781FE4B2BDA ListShellHook: grep-dctrl -X -S cassandra || [ $? -eq 1 ] -Name: elasticsearch +Name: elastic Method: https://artifacts.elastic.co/packages/5.x/apt Components: main>thirdparty UDebComponents: @@ -73,7 +73,7 @@ GetInRelease: no Architectures: amd64 VerifyRelease: D27D666CD88E42B4 -ListShellHook: grep-dctrl -X -S elasticsearch -a -F Version --eq 5.3.2 || [ $? -eq 1 ] +ListShellHook: grep-dctrl -X -S '^elasticsearch|logstash|kibana$' -a -F Version --eq 5.3.2 || [ $? -eq 1 ] Name: elasticsearch-curator Method: http://packages.elastic.co/curator/5/debian @@ -84,26 +84,6 @@ Architectures: amd64 VerifyRelease: D27D666CD88E42B4 ListShellHook: grep-dctrl -X -S elasticsearch-curator || [ $? -eq 1 ] - -Name: logstash -Method: https://artifacts.elastic.co/packages/5.x/apt -Components: main>thirdparty -UDebComponents: -Suite: stable -GetInRelease: no -Architectures: amd64 -VerifyRelease: D27D666CD88E42B4 -ListShellHook: grep-dctrl -X -S logstash -a -F Version --eq 5.3.2 || [ $? -eq 1 ] - -Name: kibana -Method: https://artifacts.elastic.co/packages/5.x/apt -Components: main>thirdparty -UDebComponents: -Suite: stable -GetInRelease: no -Architectures: amd64 -VerifyRelease: D27D666CD88E42B4 -ListShellHook: grep-dctrl -X -S kibana -a -F Version --eq 5.3.2 || [ $? -eq 1 ] Name: tor Method: http://deb.torproject.org/torproject.org/ -- To view, visit https://gerrit.wikimedia.org/r/352605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I412713647ccacf9d70bc2bafd80f52640fad4daf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
