[MediaWiki-commits] [Gerrit] operations/puppet[production]: Labs: Remove obsolete code

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326312 )

Change subject: Labs: Remove obsolete code
..


Labs: Remove obsolete code

Change-Id: I51d3536c078e709373727055eb7f26903a09da16
---
M modules/role/manifests/labs/instance.pp
1 file changed, 0 insertions(+), 14 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/labs/instance.pp 
b/modules/role/manifests/labs/instance.pp
index 0431916..bded096 100644
--- a/modules/role/manifests/labs/instance.pp
+++ b/modules/role/manifests/labs/instance.pp
@@ -39,20 +39,6 @@
 require role::labs::nfsclient
 }
 
-if os_version('ubuntu <= precise') {
-# Was used by ssh earlier, not any more
-# Remove in a few weeks?
-file { '/public/keys':
-ensure  => absent,
-force   => true,
-require => Mount['/public/keys'],
-}
-
-mount { '/public/keys':
-ensure  => absent,
-}
-}
-
 # In production, we try to be punctilious about having Puppet manage
 # system state, and thus it's reasonable to purge Apache site configs
 # that have not been declared via Puppet. But on Labs we want to allow

-- 
To view, visit https://gerrit.wikimedia.org/r/326312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I51d3536c078e709373727055eb7f26903a09da16
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Labs: Remove obsolete code

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326312 )

Change subject: Labs: Remove obsolete code
..

Labs: Remove obsolete code

Change-Id: I51d3536c078e709373727055eb7f26903a09da16
---
M modules/role/manifests/labs/instance.pp
1 file changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/326312/1

diff --git a/modules/role/manifests/labs/instance.pp 
b/modules/role/manifests/labs/instance.pp
index 0431916..bded096 100644
--- a/modules/role/manifests/labs/instance.pp
+++ b/modules/role/manifests/labs/instance.pp
@@ -39,20 +39,6 @@
 require role::labs::nfsclient
 }
 
-if os_version('ubuntu <= precise') {
-# Was used by ssh earlier, not any more
-# Remove in a few weeks?
-file { '/public/keys':
-ensure  => absent,
-force   => true,
-require => Mount['/public/keys'],
-}
-
-mount { '/public/keys':
-ensure  => absent,
-}
-}
-
 # In production, we try to be punctilious about having Puppet manage
 # system state, and thus it's reasonable to purge Apache site configs
 # that have not been declared via Puppet. But on Labs we want to allow

-- 
To view, visit https://gerrit.wikimedia.org/r/326312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51d3536c078e709373727055eb7f26903a09da16
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits