Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378696 )
Change subject: Remove salt grains used for trebuchet
......................................................................
Remove salt grains used for trebuchet
Also remove a bit related code currently using the grains.
To be merged once 129290 is resolved
Change-Id: I215bb0ae807ffa19342146295e67328e419d1cb7
---
M modules/deployment/manifests/deployment_server.pp
M modules/trebuchet/manifests/init.pp
2 files changed, 0 insertions(+), 49 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/deployment_server.pp
b/modules/deployment/manifests/deployment_server.pp
index 4c0941a..2ff12c7 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -59,40 +59,4 @@
system => true,
}
}
-
- salt::grain { 'deployment_server':
- grain => 'deployment_server',
- value => true,
- replace => true,
- }
-
- salt::grain { 'deployment_repo_user':
- grain => 'deployment_repo_user',
- value => 'trebuchet',
- replace => true,
- }
-
- salt::grain { 'deployment_repo_group':
- grain => 'deployment_repo_group',
- value => $deployment_group,
- replace => true,
- }
-
- exec { 'deployment_server_sync_all':
- refreshonly => true,
- path => ['/usr/bin'],
- command => 'salt-call saltutil.sync_all',
- subscribe => Salt::Grain['deployment_server'],
- timeout => 1200,
- }
-
- exec { 'eventual_consistency_deployment_server_init':
- path => ['/usr/bin', '/usr/sbin', '/sbin', '/bin'],
- command => 'salt-call deploy.deployment_server_init',
- require => [
- Package['salt-minion'],
- Salt::Grain['deployment_server'],
- Salt::Grain['deployment_repo_user'],
- ];
- }
}
diff --git a/modules/trebuchet/manifests/init.pp
b/modules/trebuchet/manifests/init.pp
index 9acafb2..6c1b2d7 100644
--- a/modules/trebuchet/manifests/init.pp
+++ b/modules/trebuchet/manifests/init.pp
@@ -13,17 +13,4 @@
}
include ::trebuchet::packages
-
- salt::grain { 'trebuchet_master':
- value => $trebuchet_master,
- replace => true,
- }
-
- # Trebuchet needs salt-minion to query grains, and it needs the
- # `trebuchet_master` grain set so that it knows where to fetch from.
- # It also needs the dependencies from ::trebuchet::packages.
- Service['salt-minion'] ->
- Salt::Grain['trebuchet_master'] ->
- Class['::trebuchet::packages'] ->
- Package <| provider == 'trebuchet' |>
}
--
To view, visit https://gerrit.wikimedia.org/r/378696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I215bb0ae807ffa19342146295e67328e419d1cb7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
