Yuvipanda has submitted this change and it was merged.
Change subject: Labs: Remove various obsolete migration code
......................................................................
Labs: Remove various obsolete migration code
Change-Id: Ie0de2def6b309d3d03dc383a07304601af768c4f
---
M manifests/role/labs.pp
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/master.pp
4 files changed, 0 insertions(+), 29 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
coren: Looks good to me, but someone else must approve
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index b690c43..417a488 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -167,11 +167,6 @@
ensure => absent,
}
- # TODO: Remove after Puppet cycle.
- file { '/usr/local/sbin/reboot-if-idmap':
- 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
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 880a151..588f3cc 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -78,9 +78,4 @@
group => 'root',
content => template('toollabs/crontab.erb'),
}
- # TODO: Remove after deployment.
- file { '/usr/local/bin/xcrontab':
- ensure => absent,
- }
-
}
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index cc60b24..8089a8f 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -138,10 +138,6 @@
handle => 'tools-project',
require => File[$toollabs::sysdir],
}
- # TODO: Remove after migration.
- file { '/etc/apt/sources.list.d/local.list':
- ensure => absent,
- }
# Trustworthy enough
# Only necessary on precise hosts, trusty has its own mariadb package
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index fa12a23..44534be 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -63,20 +63,5 @@
source => 'puppet:///modules/toollabs/host_aliases',
require => Mount['/var/lib/gridengine'],
}
-
- # TODO: Remove after migration.
- file { "${toollabs::repo}/update-repo.sh":
- ensure => absent,
- }
- exec { 'Move Tools all packages to new structure':
- command => "/bin/mv -i ${toollabs::repo}/all/*.deb ${toollabs::repo}/
&& /bin/rm -f ${toollabs::repo}/all/Packages && /bin/rmdir
${toollabs::repo}/all",
- onlyif => "/usr/bin/test -d ${toollabs::repo}/all",
- notify => Exec["Turn ${toollabs::repo} into deb repo"],
- }
- exec { 'Move Tools amd64 packages to new structure':
- command => "/bin/mv -i ${toollabs::repo}/amd64/*.deb
${toollabs::repo}/ && /bin/rm -f ${toollabs::repo}/amd64/Packages && /bin/rmdir
${toollabs::repo}/amd64",
- onlyif => "/usr/bin/test -d ${toollabs::repo}/amd64",
- notify => Exec["Turn ${toollabs::repo} into deb repo"],
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/227493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0de2def6b309d3d03dc383a07304601af768c4f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
