Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311732
Change subject: labstore: use secondary interface for DRBD replication
......................................................................
labstore: use secondary interface for DRBD replication
* Assign IP as reserved in DNS
* Put the right ip in the right place
* Use it as the peer identifier for the config
Change-Id: I404f340f23db4bb49e99240c2d88cf989b3f17c9
---
M modules/role/manifests/labs/nfs/secondary.pp
1 file changed, 26 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/311732/1
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index fad8b3d..b6c882e 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -11,24 +11,44 @@
# Enable RPS to balance IRQs over CPUs
interface::rps { $monitor: }
+ if $hostname == 'labstore1005' {
+ interface::ip { 'drbd-replication':
+ interface => 'eth1',
+ address => '10.64.37.26',
+ prefixlen => '24',
+ }
+ }
+
+ if $hostname == 'labstore1004' {
+ interface::ip { 'drbd-replication':
+ interface => 'eth1',
+ address => '10.64.37.25',
+ prefixlen => '24',
+ }
+ }
+
+ $drbd_nodes = ['eth1.labstore1004.eqiad.wmnet',
'eth1.labstore1005.eqiad.wmnet']
labstore::drbd::resource {'test':
- nodes => ['labstore1004', 'labstore1005'],
- port => '7790',
- device => '/dev/drbd1',
- disk => '/dev/misc/test',
+ nodes => $drbd_nodes,
+ port => '7790',
+ device => '/dev/drbd1',
+ disk => '/dev/misc/test',
+ require => Interface::Ip['drbd-replication'],
}
labstore::drbd::resource {'tools':
- nodes => ['labstore1004', 'labstore1005'],
+ nodes => $drbd_nodes,
port => '7791',
device => '/dev/drbd2',
disk => '/dev/tools-project/tools-project',
+ require => Interface::Ip['drbd-replication'],
}
labstore::drbd::resource {'others':
- nodes => ['labstore1004', 'labstore1005'],
+ nodes => $drbd_nodes,
port => '7792',
device => '/dev/drbd3',
disk => '/dev/misc/others',
+ require => Interface::Ip['drbd-replication'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/311732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I404f340f23db4bb49e99240c2d88cf989b3f17c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
