Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Update hieradata for trebuchet module
......................................................................
Update hieradata for trebuchet module
trebuchet was recently moved from a role to a module. This update is
needed so that labs gets the correct `trebuchet_master` grain which is
needed by the puppet trebuchet provider.
Bug: T119988
Change-Id: I87f919ff6b666ec4969aa95e5db079661f3f2d59
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/staging/common.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: 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 0235c45..7c899f0 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -117,7 +117,7 @@
"beta::syncsiteresources::user": www-data
"role::url_downloader::url_downloader_ip": 10.68.16.135
"zotero::http_proxy":
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
-"role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs
+"trebuchet::deployment_server":
deployment-bastion.deployment-prep.eqiad.wmflabs
"scap::dsh::group_source": 'puppet:///modules/beta/dsh/group'
"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
diff --git a/hieradata/labs/staging/common.yaml
b/hieradata/labs/staging/common.yaml
index ac93afe..8644a7b 100644
--- a/hieradata/labs/staging/common.yaml
+++ b/hieradata/labs/staging/common.yaml
@@ -7,7 +7,7 @@
salt::master::salt_module_roots: { base: [ '/srv/salt/_modules' ] }
salt::master::salt_returner_roots: { base: [ '/srv/salt/_returners' ] }
role::deployment::salt_masters::deployment_server: staging-tin.eqiad.wmflabs
-role::trebuchet::deployment_server: staging-tin.eqiad.wmflabs
+trebuchet::deployment_server: staging-tin.staging.eqiad.wmflabs
elasticsearch::expected_nodes: 3
elasticsearch::minimum_master_nodes: 3
elasticsearch::heap_memory: 4G
--
To view, visit https://gerrit.wikimedia.org/r/256261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87f919ff6b666ec4969aa95e5db079661f3f2d59
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
