Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379508 )
Change subject: Salt: completely remove the orchestration class
......................................................................
Salt: completely remove the orchestration class
Bug: T166300
Change-Id: I08534898176035f74dad4d32f9bdcc27a1cf4eb4
---
M modules/profile/manifests/cumin/master.pp
M modules/salt/manifests/master.pp
D modules/salt/manifests/orchestration.pp
3 files changed, 1 insertion(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/modules/profile/manifests/cumin/master.pp
b/modules/profile/manifests/cumin/master.pp
index b560a8b..2847240 100644
--- a/modules/profile/manifests/cumin/master.pp
+++ b/modules/profile/manifests/cumin/master.pp
@@ -75,8 +75,7 @@
group => 'root',
}
- # TODO: remove the -new suffix once the salt version has beed
decommissioned
- file { '/usr/local/sbin/wmf-auto-reimage-new':
+ file { '/usr/local/sbin/wmf-auto-reimage':
ensure => present,
source => 'puppet:///modules/profile/cumin/wmf_auto_reimage.py',
mode => '0544',
diff --git a/modules/salt/manifests/master.pp b/modules/salt/manifests/master.pp
index 5cc8e61..094810b 100644
--- a/modules/salt/manifests/master.pp
+++ b/modules/salt/manifests/master.pp
@@ -89,6 +89,5 @@
group => 'root',
}
- include salt::orchestration
include salt::monitoring
}
diff --git a/modules/salt/manifests/orchestration.pp
b/modules/salt/manifests/orchestration.pp
deleted file mode 100644
index e2c876e..0000000
--- a/modules/salt/manifests/orchestration.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class salt::orchestration() {
- file { '/usr/local/sbin/wmf-auto-reimage':
- ensure => present,
- source => 'puppet:///modules/salt/wmf_auto_reimage.py',
- mode => '0544',
- owner => 'root',
- group => 'root',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/379508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08534898176035f74dad4d32f9bdcc27a1cf4eb4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
