Thcipriani has uploaded a new change for review. https://gerrit.wikimedia.org/r/306070
Change subject: Beta Scap: dsh groups in hieradata ...................................................................... Beta Scap: dsh groups in hieradata Change-Id: Ic9d427b6db82f636159e96b833bb66ffb4013cae --- M hieradata/labs/deployment-prep/common.yaml D modules/beta/files/dsh/group/mediawiki-api-canaries D modules/beta/files/dsh/group/mediawiki-appserver-canaries D modules/beta/files/dsh/group/mediawiki-installation 4 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/70/306070/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 93ca450..218e1a5 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -165,7 +165,21 @@ "zotero::http_proxy": deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080 "trebuchet::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs "scap::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs -"scap::dsh::group_source": 'puppet:///modules/beta/dsh/group' +scap::dsh::groups: + mediawiki-installation: + hosts: + - deployment-jobrunner01.deployment-prep.eqiad.wmflabs + - deployment-mediawiki01.deployment-prep.eqiad.wmflabs + - deployment-mediawiki02.deployment-prep.eqiad.wmflabs + - deployment-mediawiki03.deployment-prep.eqiad.wmflabs + - deployment-tmh01.deployment-prep.eqiad.wmflabs + - deployment-tin.deployment-prep.eqiad.wmflabs + - mira.deployment-prep.eqiad.wmflabs + mediawiki-appserver-canaries: + hosts: + - deployment-mediawiki01.deployment-prep.eqiad.wmflabs + mediawiki-api-canaries: + hosts: [] "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. diff --git a/modules/beta/files/dsh/group/mediawiki-api-canaries b/modules/beta/files/dsh/group/mediawiki-api-canaries deleted file mode 100644 index e69de29..0000000 --- a/modules/beta/files/dsh/group/mediawiki-api-canaries +++ /dev/null diff --git a/modules/beta/files/dsh/group/mediawiki-appserver-canaries b/modules/beta/files/dsh/group/mediawiki-appserver-canaries deleted file mode 100644 index fdc8186..0000000 --- a/modules/beta/files/dsh/group/mediawiki-appserver-canaries +++ /dev/null @@ -1 +0,0 @@ -deployment-mediawiki01.deployment-prep.eqiad.wmflabs diff --git a/modules/beta/files/dsh/group/mediawiki-installation b/modules/beta/files/dsh/group/mediawiki-installation deleted file mode 100644 index f88f395..0000000 --- a/modules/beta/files/dsh/group/mediawiki-installation +++ /dev/null @@ -1,7 +0,0 @@ -deployment-jobrunner01.deployment-prep.eqiad.wmflabs -deployment-mediawiki01.deployment-prep.eqiad.wmflabs -deployment-mediawiki02.deployment-prep.eqiad.wmflabs -deployment-mediawiki03.deployment-prep.eqiad.wmflabs -deployment-tmh01.deployment-prep.eqiad.wmflabs -deployment-tin.deployment-prep.eqiad.wmflabs -mira.deployment-prep.eqiad.wmflabs -- To view, visit https://gerrit.wikimedia.org/r/306070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9d427b6db82f636159e96b833bb66ffb4013cae Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
