Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359089 )
Change subject: releases: add new role/profile, add backups, install jenkins
......................................................................
releases: add new role/profile, add backups, install jenkins
Add new role class for new releases server.
Add new profile for mediawiki::releases and include it in new role.
Add jenkins install in new profile, as requested by Chad on
Ie12ac955618d41.
Add backup::host to prepare Bacula backups of releases files.
Move standard and firewall into role class.
Bug: T164030
Change-Id: Iaa6ae686144a7b911cbc82d26346cba2db201478
---
R hieradata/role/common/releases.yaml
M manifests/site.pp
A modules/profile/manifests/releases/mediawiki.pp
A modules/role/manifests/releases.pp
4 files changed, 26 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/releases1001.yaml
b/hieradata/role/common/releases.yaml
similarity index 100%
rename from hieradata/hosts/releases1001.yaml
rename to hieradata/role/common/releases.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 4bc4766..38dca5d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2381,8 +2381,7 @@
# upcoming VM for releases (mwreleases and other)
node 'releases1001.eqiad.wmnet' {
- include ::standard
- include ::base::firewall
+ role(releases)
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/profile/manifests/releases/mediawiki.pp
b/modules/profile/manifests/releases/mediawiki.pp
new file mode 100644
index 0000000..39b79fe
--- /dev/null
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -0,0 +1,13 @@
+# server hosting Mediawiki releases
+# https://releases.wikimedia.org/mediawiki/
+class profile::releases::mediawiki {
+
+ class { '::jenkins':
+ access_log => true,
+ http_port => '8080',
+ prefix => '/jenkins',
+ umask => '0002',
+ }
+
+ backup::set { 'srv-org-wikimedia': }
+}
diff --git a/modules/role/manifests/releases.pp
b/modules/role/manifests/releases.pp
new file mode 100644
index 0000000..13114df
--- /dev/null
+++ b/modules/role/manifests/releases.pp
@@ -0,0 +1,12 @@
+class role::releases {
+
+ system::role { 'releases':
+ ensure => 'present',
+ description => 'Wikimedia Software Releases Server',
+ }
+
+ include ::standard
+ include ::base::firewall
+ include ::profile::backup::host
+ include ::profile::releases::mediawiki
+}
--
To view, visit https://gerrit.wikimedia.org/r/359089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa6ae686144a7b911cbc82d26346cba2db201478
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
