Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327693 )
Change subject: contint: fix/move 'backup'-includes, move from node to role
......................................................................
contint: fix/move 'backup'-includes, move from node to role
Move backup includes from the node level into the role level.
They were already duplicated but only of the 2 backup sets
in another place.
Bug: T150771
Change-Id: Ic1ad70f17893d51590fa50fcb2225622880e40e3
---
M manifests/site.pp
M modules/role/manifests/ci/master.pp
2 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index c961ce3..5fb3c60 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -291,8 +291,8 @@
role(ci::master,
ci::slave,
ci::website,
- zuul::server,
- backup::host)
+ zuul::server)
+
include standard
interface::add_ip6_mapped { 'main': interface => 'eth0', }
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index b44760f..cecc9ad 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -19,6 +19,9 @@
include ::jenkins,
contint::proxy_jenkins
+ # Backups
+ include role::backup::host
+ backup::set {'var-lib-jenkins-config': }
backup::set { 'contint' : }
# Nodepool spawn non ephemeral slaves which causes config-history plugin to
@@ -64,9 +67,4 @@
}
require contint::master_dir
-
- # backups
- include role::backup::host
- backup::set {'var-lib-jenkins-config': }
-
}
--
To view, visit https://gerrit.wikimedia.org/r/327693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1ad70f17893d51590fa50fcb2225622880e40e3
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
