From: Stephen Gran <steve@lobefin.net>
Date: Fri, 6 Aug 2010 16:27:10 +0000 (+0100)
Subject: add master to carnet hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7313b1a8e9dbf7b68faa1060e06b8a865844c495;p=mirror%2Fdsa-puppet.git

add master to carnet hosts

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0ff422b37..3018fb531 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -20,7 +20,8 @@ if %w{lebrun schroeder}.include?(hostname) then
 	out << '@def $KIBI = ( 88.164.242.219 );'
 	ssh4allowed << '$CARNET'
 	ssh4allowed << '$KIBI'
-	ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+	ssh4allowed << '70.103.162.29' # master
+	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end
 if %w{bartok beethoven}.include?(hostname) then
 	ssh4allowed << '$HOST_DEBIAN_V4'