Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333986 )
Change subject: labstore: change drbd link over to /30 192.168
......................................................................
labstore: change drbd link over to /30 192.168
Here I am changing the old mechanism to stop assuming
the address is to be resolved. It seems more prudent to
protect the drbd.d configs from DNS issues, and also
I am changing this to match the reality of the setup now
post direct connection.
Change-Id: Ie3dc34ba61e189b688dba0dec8727f8fa7972ad4
---
M modules/labstore/templates/drbd/drbd_resource.res.erb
M modules/role/manifests/labs/nfs/secondary.pp
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/labstore/templates/drbd/drbd_resource.res.erb
b/modules/labstore/templates/drbd/drbd_resource.res.erb
index 8d25202..74c4bf2 100644
--- a/modules/labstore/templates/drbd/drbd_resource.res.erb
+++ b/modules/labstore/templates/drbd/drbd_resource.res.erb
@@ -2,14 +2,14 @@
on <%= @drbd_hosts.first %> {
device <%= @device %>;
- address <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.first],
4]) %>:<%= @port %>;
+ address <%= @drbd_cluster[@drbd_hosts.first] %>:<%= @port %>;
disk <%= @disk %>;
meta-disk internal;
}
on <%= @drbd_hosts.last %> {
device <%= @device %>;
- address <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.last],
4]) %>:<%= @port %>;
+ address <%= @drbd_cluster[@drbd_hosts.last] %>:<%= @port %>;
disk <%= @disk %>;
meta-disk internal;
}
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index 79bb4bd..ecc5ee8 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -22,8 +22,8 @@
interface::ip { 'drbd-replication':
interface => 'eth1',
- address => '10.64.37.26',
- prefixlen => '24',
+ address => '192.168.0.2',
+ prefixlen => '30',
require => Interface::Manual['eth1'],
}
}
@@ -34,8 +34,8 @@
interface::ip { 'drbd-replication':
interface => 'eth1',
- address => '10.64.37.25',
- prefixlen => '24',
+ address => '192.168.0.1',
+ prefixlen => '30',
require => Interface::Manual['eth1'],
}
}
@@ -71,8 +71,8 @@
$drbd_defaults = {
'drbd_cluster' => {
- 'labstore1004' => 'eth1.labstore1004.eqiad.wmnet',
- 'labstore1005' => 'eth1.labstore1005.eqiad.wmnet',
+ 'labstore1004' => '192.168.0.1',
+ 'labstore1005' => '192.168.0.2',
},
}
--
To view, visit https://gerrit.wikimedia.org/r/333986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3dc34ba61e189b688dba0dec8727f8fa7972ad4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
