From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 6 Jan 2018 13:13:04 +0000 (+0100)
Subject: Allow adayevskaya to ssh trigger puppetmaster/handel
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5581d1ce1ee3ea09e6e7740f575cb19104e62c4f;p=mirror%2Fdsa-puppet.git

Allow adayevskaya to ssh trigger puppetmaster/handel
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 21d35483b..c392a270b 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -44,6 +44,10 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << %w{$HOST_DEBIAN_V4}
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
+	if scope.function_has_role(['puppetmaster']) then
+		ssh4allowed << "5.153.231.5" # adayevskaya
+		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
+	end
 	if scope.function_has_role(['dns_primary']) then
 		ssh4allowed << "5.153.231.5" # adayevskaya
 		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya