Ori.livneh has submitted this change and it was merged.
Change subject: Remove old parsoid deploy repos and remove parsoid salt module
......................................................................
Remove old parsoid deploy repos and remove parsoid salt module
It seems at some point the parsoid module was removed from the
repo, but wasn't removed from the salt config. The missing
module breaks the module/grain/pillar refresh across
the cluster. This change cleans that up and removes any reference
to it (which removes the old parsoid deploy repos).
Change-Id: I74d63e9dfd516f7afc27f111d5919f6f81db813a
---
M manifests/role/deployment.pp
M modules/deployment/manifests/salt_master.pp
2 files changed, 0 insertions(+), 20 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 38ef7ec..cb20a3c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -80,17 +80,6 @@
'grain' => 'gdash',
'upstream' =>
'https://gerrit.wikimedia.org/r/operations/software/gdash',
},
- 'parsoid/Parsoid' => {
- 'grain' => 'parsoid',
- 'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/extensions/Parsoid',
- 'checkout_module_calls' => {
- 'parsoid.config_symlink' => ['__REPO__'],
- },
- 'service_name' => 'parsoid',
- },
- 'parsoid/config' => {
- 'grain' => 'parsoid',
- },
'parsoid/deploy' => {
'grain' => 'parsoid',
'upstream' =>
'https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy',
diff --git a/modules/deployment/manifests/salt_master.pp
b/modules/deployment/manifests/salt_master.pp
index 288bccc..dbac3a4 100644
--- a/modules/deployment/manifests/salt_master.pp
+++ b/modules/deployment/manifests/salt_master.pp
@@ -95,14 +95,6 @@
require => [File[$returner_dir]],
}
- file { "${module_dir}/parsoid.py":
- source => 'puppet:///modules/deployment/modules/parsoid.py',
- mode => '0555',
- owner => 'root',
- group => 'root',
- require => [File[$module_dir]],
- }
-
file { "${module_dir}/mwprof.py":
source => 'puppet:///modules/deployment/modules/mwprof.py',
mode => '0555',
@@ -139,7 +131,6 @@
exec { 'refresh_deployment_modules':
command => "/usr/bin/salt -G 'deployment_target:*'
saltutil.sync_modules",
subscribe => [File["${module_dir}/deploy.py"],
- File["${module_dir}/parsoid.py"],
File["${module_dir}/mwprof.py"],
File["${module_dir}/mediawiki.py"]],
refreshonly => true,
--
To view, visit https://gerrit.wikimedia.org/r/112316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74d63e9dfd516f7afc27f111d5919f6f81db813a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
