coren has submitted this change and it was merged. Change subject: Labs: remove has_admin override for labs::nfs::fileserver ......................................................................
Labs: remove has_admin override for labs::nfs::fileserver At long last! Bug: T87870 Change-Id: If2bde2c30ce260710651d01cf77be60ff1630f1b --- M hieradata/role/codfw/labs/nfs/fileserver.yaml M hieradata/role/common/labs/nfs/extras.yaml M hieradata/role/common/labs/nfs/fileserver.yaml 3 files changed, 0 insertions(+), 3 deletions(-) Approvals: ArielGlenn: Looks good to me, but someone else must approve coren: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/codfw/labs/nfs/fileserver.yaml b/hieradata/role/codfw/labs/nfs/fileserver.yaml index 8ba0b42..c62a966 100644 --- a/hieradata/role/codfw/labs/nfs/fileserver.yaml +++ b/hieradata/role/codfw/labs/nfs/fileserver.yaml @@ -1,2 +1 @@ cluster: labsnfs -standard::has_admin: true diff --git a/hieradata/role/common/labs/nfs/extras.yaml b/hieradata/role/common/labs/nfs/extras.yaml index 2bd8faf..b89f2ce 100644 --- a/hieradata/role/common/labs/nfs/extras.yaml +++ b/hieradata/role/common/labs/nfs/extras.yaml @@ -1,5 +1,4 @@ cluster: labsnfs -standard::has_admin: false role::labs::nfs::extras::dump_servers_ips: - '208.80.154.11' - '208.80.152.185' diff --git a/hieradata/role/common/labs/nfs/fileserver.yaml b/hieradata/role/common/labs/nfs/fileserver.yaml index 185790e..f6874f9 100644 --- a/hieradata/role/common/labs/nfs/fileserver.yaml +++ b/hieradata/role/common/labs/nfs/fileserver.yaml @@ -1,5 +1,4 @@ cluster: labsnfs -standard::has_admin: false ldap::client::nss::nsswitch_conf_source: file:///usr/share/base-files/nsswitch.conf # This is there because we have a ssh::userkey stanza # and it will not be used without this hack. Same -- To view, visit https://gerrit.wikimedia.org/r/255118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2bde2c30ce260710651d01cf77be60ff1630f1b Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren <mpellet...@wikimedia.org> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: coren <mpellet...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
