Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/280503
Change subject: resolving::domain_search: drop esams.wikimedia.org ...................................................................... resolving::domain_search: drop esams.wikimedia.org In response to T123712#1948876 and after reinstalling hooft, drop esams.wikimedia.org from domain search. Replace with esams.wmnet where that was missing. Bug:T123712 Change-Id: Ia115cec16b9e248302fc7b5ac208460cb6092c31 --- M hieradata/hosts/iron.yaml M hieradata/hosts/mira.yaml M hieradata/hosts/mw1152.yaml M hieradata/hosts/neon.yaml M hieradata/hosts/palladium.yaml M hieradata/hosts/rutherfordium.yaml M hieradata/hosts/tin.yaml M hieradata/role/common/bastionhost/general.yaml M hieradata/role/common/mediawiki/maintenance.yaml 9 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/280503/1 diff --git a/hieradata/hosts/iron.yaml b/hieradata/hosts/iron.yaml index c5e5605..8332b35 100644 --- a/hieradata/hosts/iron.yaml +++ b/hieradata/hosts/iron.yaml @@ -1,5 +1,5 @@ base::resolving::domain_search: - wikimedia.org - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet - codfw.wmnet diff --git a/hieradata/hosts/mira.yaml b/hieradata/hosts/mira.yaml index ce94ea1..ddb806b 100644 --- a/hieradata/hosts/mira.yaml +++ b/hieradata/hosts/mira.yaml @@ -2,6 +2,6 @@ - wikimedia.org - codfw.wmnet - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet cluster: misc scap::l10nupdate::run_l10nupdate: false diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml index 5381d1e..d6023fe 100644 --- a/hieradata/hosts/mw1152.yaml +++ b/hieradata/hosts/mw1152.yaml @@ -5,7 +5,7 @@ base::resolving::domain_search: - wikimedia.org - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet - codfw.wmnet mediawiki::maintenance::pagetriage::ensure: absent mediawiki::maintenance::translationnotifications::ensure: absent diff --git a/hieradata/hosts/neon.yaml b/hieradata/hosts/neon.yaml index 89acc2b..0998f0d 100644 --- a/hieradata/hosts/neon.yaml +++ b/hieradata/hosts/neon.yaml @@ -4,4 +4,3 @@ - eqiad.wmnet - codfw.wmnet - ulsfo.wmnet - - esams.wikimedia.org diff --git a/hieradata/hosts/palladium.yaml b/hieradata/hosts/palladium.yaml index 403e0d3..9aea59f 100644 --- a/hieradata/hosts/palladium.yaml +++ b/hieradata/hosts/palladium.yaml @@ -4,7 +4,6 @@ - eqiad.wmnet - codfw.wmnet - ulsfo.wmnet - - esams.wikimedia.org confd::monitor_files: false apache::logrotate::period: "daily" apache::logrotate::rotate: 7 diff --git a/hieradata/hosts/rutherfordium.yaml b/hieradata/hosts/rutherfordium.yaml index 6a18248..8244d96 100644 --- a/hieradata/hosts/rutherfordium.yaml +++ b/hieradata/hosts/rutherfordium.yaml @@ -1,7 +1,7 @@ base::resolving::domain_search: - wikimedia.org - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet - codfw.wmnet admin::groups: - analytics-admins diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 638589a..cdb70f7 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -1,7 +1,7 @@ base::resolving::domain_search: - wikimedia.org - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet - codfw.wmnet cluster: misc scap::l10nupdate::run_l10nupdate: true diff --git a/hieradata/role/common/bastionhost/general.yaml b/hieradata/role/common/bastionhost/general.yaml index 3375d73..e596cb8 100644 --- a/hieradata/role/common/bastionhost/general.yaml +++ b/hieradata/role/common/bastionhost/general.yaml @@ -4,7 +4,6 @@ - eqiad.wmnet - codfw.wmnet - ulsfo.wmnet - - esams.wikimedia.org - esams.wmnet admin::groups: - deployment diff --git a/hieradata/role/common/mediawiki/maintenance.yaml b/hieradata/role/common/mediawiki/maintenance.yaml index 48ea335..b5b08ab 100644 --- a/hieradata/role/common/mediawiki/maintenance.yaml +++ b/hieradata/role/common/mediawiki/maintenance.yaml @@ -5,7 +5,7 @@ base::resolving::domain_search: - wikimedia.org - eqiad.wmnet - - esams.wikimedia.org + - esams.wmnet - codfw.wmnet hhvm::extra::cli: hhvm: -- To view, visit https://gerrit.wikimedia.org/r/280503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia115cec16b9e248302fc7b5ac208460cb6092c31 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
