Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336672 )
Change subject: multiple roles: lint-fix role::backup::host includes
......................................................................
multiple roles: lint-fix role::backup::host includes
Bug: T93645
Change-Id: Ifeba87ff3f6efd7d0c7c0d132326f2e6e656f5bf
---
M modules/role/manifests/aptrepo/wikimedia.pp
M modules/role/manifests/archiva.pp
M modules/role/manifests/ci/master.pp
M modules/role/manifests/deployment/server.pp
M modules/role/manifests/ganglia/web.pp
M modules/role/manifests/gerrit/server.pp
M modules/role/manifests/installserver/preseed.pp
M modules/role/manifests/installserver/tftp.pp
M modules/role/manifests/lists/server.pp
M modules/role/manifests/microsites/releases.pp
10 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index b5a78fd..7416a90 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -19,7 +19,7 @@
source => 'puppet:///modules/aptrepo/distributions-wikimedia',
}
- include role::backup::host
+ include ::role::backup::host
backup::set { 'srv-wikimedia': }
include aptrepo::rsync
diff --git a/modules/role/manifests/archiva.pp
b/modules/role/manifests/archiva.pp
index 4cdd1ca..04404cd 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -22,7 +22,7 @@
# Bacula backups for /var/lib/archiva.
if $::realm == 'production' {
- include role::backup::host
+ include ::role::backup::host
backup::set { 'var-lib-archiva':
require => Class['::archiva']
}
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index 60411ac..3b466bf 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -22,7 +22,7 @@
include ::contint::proxy_jenkins
# Backups
- include role::backup::host
+ include ::role::backup::host
backup::set {'var-lib-jenkins-config': }
backup::set { 'contint' : }
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 7a4d570..0cd4c36 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -39,7 +39,7 @@
if $::realm != 'labs' {
include role::microsites::releases::upload
# backup /home dirs on deployment servers
- include role::backup::host
+ include ::role::backup::host
backup::set {'home': }
}
diff --git a/modules/role/manifests/ganglia/web.pp
b/modules/role/manifests/ganglia/web.pp
index 78a78d6..86ec0b5 100644
--- a/modules/role/manifests/ganglia/web.pp
+++ b/modules/role/manifests/ganglia/web.pp
@@ -91,7 +91,7 @@
description => 'HTTP',
check_command => 'check_http',
}
- include role::backup::host
+ include ::role::backup::host
backup::set { 'var-lib-ganglia': }
backup::set { 'srv-ganglia': }
diff --git a/modules/role/manifests/gerrit/server.pp
b/modules/role/manifests/gerrit/server.pp
index b7fb84e..0def276 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -5,7 +5,7 @@
system::role { 'role::gerrit::server': description => 'Gerrit server' }
include standard
- include role::backup::host
+ include ::role::backup::host
include base::firewall
monitoring::service { 'gerrit_ssh':
diff --git a/modules/role/manifests/installserver/preseed.pp
b/modules/role/manifests/installserver/preseed.pp
index 66a80ca..7c56cd0 100644
--- a/modules/role/manifests/installserver/preseed.pp
+++ b/modules/role/manifests/installserver/preseed.pp
@@ -2,7 +2,7 @@
class role::installserver::preseed {
include standard
- include role::backup::host
+ include ::role::backup::host
include install_server::preseed_server
# Backup
diff --git a/modules/role/manifests/installserver/tftp.pp
b/modules/role/manifests/installserver/tftp.pp
index d81d0b2..f831dda 100644
--- a/modules/role/manifests/installserver/tftp.pp
+++ b/modules/role/manifests/installserver/tftp.pp
@@ -24,7 +24,7 @@
include standard
include base::firewall
- include role::backup::host
+ include ::role::backup::host
include install_server::tftp_server
ferm::rule { 'tftp':
diff --git a/modules/role/manifests/lists/server.pp
b/modules/role/manifests/lists/server.pp
index beff048..e751747 100644
--- a/modules/role/manifests/lists/server.pp
+++ b/modules/role/manifests/lists/server.pp
@@ -71,7 +71,7 @@
content => secret('dkim/lists.wikimedia.org-wikimedia.key'),
}
- include role::backup::host
+ include ::role::backup::host
backup::set { 'var-lib-mailman': }
monitoring::service { 'smtp':
diff --git a/modules/role/manifests/microsites/releases.pp
b/modules/role/manifests/microsites/releases.pp
index 5beea6e..830f206 100644
--- a/modules/role/manifests/microsites/releases.pp
+++ b/modules/role/manifests/microsites/releases.pp
@@ -25,7 +25,7 @@
port => '80',
}
- include role::backup::host
+ include ::role::backup::host
backup::set { 'srv-org-wikimedia': }
}
--
To view, visit https://gerrit.wikimedia.org/r/336672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeba87ff3f6efd7d0c7c0d132326f2e6e656f5bf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Juniorsys <juniorsys_wikime...@outlook.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
