Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/226735
Change subject: labstore: Move ssh hiera settings into proper place ...................................................................... labstore: Move ssh hiera settings into proper place Change-Id: I03c0510c64910c17f971cb4330ddac26e922ad47 --- M hieradata/role/common/labs/nfs/fileserver.yaml D hieradata/role/common/labstore/fileserver.yaml 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/226735/1 diff --git a/hieradata/role/common/labs/nfs/fileserver.yaml b/hieradata/role/common/labs/nfs/fileserver.yaml index fe2e563..e85071f 100644 --- a/hieradata/role/common/labs/nfs/fileserver.yaml +++ b/hieradata/role/common/labs/nfs/fileserver.yaml @@ -4,3 +4,6 @@ # and it will not be used without this hack. Same # pattern ganeti uses. ssh::server::authorized_keys_file: /etc/ssh/userkeys/%u /etc/ssh/userkeys/%u.d/labstore +# Paramiko needs to ssh into these for replication/backups +"ssh::server::disable_nist_kex": false +"ssh::server::explicit_macs": false diff --git a/hieradata/role/common/labstore/fileserver.yaml b/hieradata/role/common/labstore/fileserver.yaml deleted file mode 100644 index dab033b..0000000 --- a/hieradata/role/common/labstore/fileserver.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Paramiko needs to ssh into these for replication/backups -"ssh::server::disable_nist_kex": false -"ssh::server::explicit_macs": false -- To view, visit https://gerrit.wikimedia.org/r/226735 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03c0510c64910c17f971cb4330ddac26e922ad47 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
