Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: role::deployment: move things to deployment::mediawiki
......................................................................
role::deployment: move things to deployment::mediawiki
Change-Id: Ib57fcee46934b2e0e97c18d887bc0b8b20e4d7fb
---
M modules/role/manifests/deployment/mediawiki.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/deployment/mediawiki.pp
b/modules/role/manifests/deployment/mediawiki.pp
index c129153..62bbc79 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -1,10 +1,21 @@
# === Class role::deployment::mediawiki
-# Installs the keyholder agent for mediawiki
+# Installs everything needed to deploy mediawiki
class role::deployment::mediawiki(
$keyholder_user = 'mwdeploy',
$keyholder_group = 'wikidev',
$key_fingerprint = 'f5:18:a3:44:77:a2:31:23:cb:7b:44:e1:4b:45:27:11',
-) {
+ ) {
+
+ # All needed classes for deploying mediawiki
+ include mediawiki
+ include ::mediawiki::nutcracker
+ include scap::master
+
+ if $::realm != 'labs' {
+ include wikitech::wiki::passwords
+ }
+
+ # Keyholder
require ::keyholder
require ::keyholder::monitoring
@@ -12,4 +23,6 @@
trusted_group => $keyholder_group,
key_fingerprint => $key_fingerprint,
}
+
+ # Wikitech credentials file
}
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index bbfbda2..b12b062 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -30,13 +30,8 @@
include network::constants
$deployable_networks = $::network::constants::deployable_networks
- include mediawiki
- include ::mediawiki::nutcracker
- include scap::master
-
if $::realm != 'labs' {
include role::releases::upload
- include wikitech::wiki::passwords
# backup /home dirs on deployment servers
include role::backup::host
backup::set {'home': }
--
To view, visit https://gerrit.wikimedia.org/r/249092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib57fcee46934b2e0e97c18d887bc0b8b20e4d7fb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
