Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298110
Change subject: gerrit: move service IP (v4 and v6) into hiera per host
......................................................................
gerrit: move service IP (v4 and v6) into hiera per host
Bug:T125018
Change-Id: Ic34cf489b50016194ab279b0b1dca5987cc529bc
---
M hieradata/hosts/lead.yaml
A hieradata/hosts/ytterbium.yaml
M modules/role/manifests/gerrit/server.pp
3 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/298110/1
diff --git a/hieradata/hosts/lead.yaml b/hieradata/hosts/lead.yaml
index 9fe7b52..d4bcfa5 100644
--- a/hieradata/hosts/lead.yaml
+++ b/hieradata/hosts/lead.yaml
@@ -1,3 +1,2 @@
-admin::groups:
- - gerrit-root
-gerrit::jetty::git: '/srv/gerrit/git'
+role::gerrit::server:serviceip_v4: '208.80.154.85'
+role::gerrit::server:serviceip_v6: '2620:0:861:3:208:80:154:85'
diff --git a/hieradata/hosts/ytterbium.yaml b/hieradata/hosts/ytterbium.yaml
new file mode 100644
index 0000000..0b12df6
--- /dev/null
+++ b/hieradata/hosts/ytterbium.yaml
@@ -0,0 +1,2 @@
+role::gerrit::server:serviceip_v4: '208.80.154.81'
+role::gerrit::server:serviceip_v6: '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..f455e6c 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -13,14 +13,17 @@
backup::set { 'var-lib-gerrit2-review_site-git': }
+ gerrit_service_ip_v4 = hiera('serviceip_v4', '127.0.0.1')
+ gerrit_service_ip_v6 = hiera('serviceip_v6', '0:0:0:0:0:0:0:1')
+
interface::ip { 'role::gerrit::server_ipv4':
interface => 'eth0',
- address => '208.80.154.81',
+ address => $gerrit_service_ip_v4,
prefixlen => '32',
}
interface::ip { 'role::gerrit::server_ipv6':
interface => 'eth0',
- address => '2620:0:861:3:208:80:154:81',
+ address => $gerrit_service_ip_v6,
prefixlen => '128',
}
--
To view, visit https://gerrit.wikimedia.org/r/298110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic34cf489b50016194ab279b0b1dca5987cc529bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
