Dzahn has submitted this change and it was merged.
Change subject: Gerrit: Require specifing IPv4 and IPv6 addresses to role
......................................................................
Gerrit: Require specifing IPv4 and IPv6 addresses to role
Change-Id: Ia2da8a88287805bbd4b9fb673d75c97bc6e12d30
---
A hieradata/hosts/ytterbium.yaml
M modules/role/manifests/gerrit/server.pp
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/ytterbium.yaml b/hieradata/hosts/ytterbium.yaml
new file mode 100644
index 0000000..f0bd18d
--- /dev/null
+++ b/hieradata/hosts/ytterbium.yaml
@@ -0,0 +1,2 @@
+role::gerrit::server::ipv4: '208.80.154.81'
+role::gerrit::server::ipv6: '2620:0:861:3:208:80:154:81'
diff --git a/modules/role/manifests/gerrit/server.pp
b/modules/role/manifests/gerrit/server.pp
index bd3aeec..bacd2e1 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -1,5 +1,5 @@
# modules/role/manifests/gerrit/production.pp
-class role::gerrit::server($host) {
+class role::gerrit::server($host, $ipv4, $ipv6) {
system::role { 'role::gerrit::server': description => 'Gerrit server' }
include role::backup::host
include base::firewall
@@ -15,12 +15,12 @@
interface::ip { 'role::gerrit::server_ipv4':
interface => 'eth0',
- address => '208.80.154.81',
+ address => $ipv4,
prefixlen => '32',
}
interface::ip { 'role::gerrit::server_ipv6':
interface => 'eth0',
- address => '2620:0:861:3:208:80:154:81',
+ address => $ipv6,
prefixlen => '128',
}
--
To view, visit https://gerrit.wikimedia.org/r/298101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2da8a88287805bbd4b9fb673d75c97bc6e12d30
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
