Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/318248
Change subject: deployment-prep/integration: stop downgrading sshd MAC and KEX ...................................................................... deployment-prep/integration: stop downgrading sshd MAC and KEX ... This is more an open question if we'll be able to do this on contint1001 Bug: T95757 Change-Id: Idac8d490e712de0eda7a4f66e2f92aec90d1f9ac --- M hieradata/labs/deployment-prep/common.yaml M hieradata/labs/integration/common.yaml 2 files changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/318248/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 90a252f..1416041 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -124,11 +124,6 @@ - wikidev "base::environment::core_dump_pattern": '/data/project/cores/%{::hostname}-core.%h.%e.%p.%t' -# T100509 Java7 on gallium does not support the hardned sshd MAC and KEX setup -# causing slaves to be unreacheable. -ssh::server::disable_nist_kex: false -ssh::server::explicit_macs: false - "role::apertium::apertium_port": 2737 "role::cxserver::cxserver_port": 8080 "misc::syslog-server::basepath": /data/project/syslog diff --git a/hieradata/labs/integration/common.yaml b/hieradata/labs/integration/common.yaml index f34d999..a117f7a 100644 --- a/hieradata/labs/integration/common.yaml +++ b/hieradata/labs/integration/common.yaml @@ -1,7 +1,3 @@ -# T100509 Java7 on gallium does not support the hardned sshd MAC and KEX setup -# causing slaves to be unreacheable. -ssh::server::disable_nist_kex: false -ssh::server::explicit_macs: false # Hosts running zuul-merger process # Use ip addresses since the values are injected in iptables rules. # -- To view, visit https://gerrit.wikimedia.org/r/318248 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idac8d490e712de0eda7a4f66e2f92aec90d1f9ac Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits