From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 14:41:28 +0000 (+0200)
Subject: replace some checks for roles::static_master with staticync::static_master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=524d3a0c93f8544f6ee9d1505416fa969773db7d;p=mirror%2Fdsa-puppet.git

replace some checks for roles::static_master with staticync::static_master
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e2e399ab8..9bc3019d2 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -106,7 +106,7 @@ file=/etc/apache2/conf.d/puppet-builddlist
 <% if classes.include?("roles::static_mirror") -%>
 file=/etc/apache2/sites-available/static-vhosts-simple
 file=/etc/static-clients.conf
-<% elsif classes.include?("roles::static_master") -%>
+<% elsif classes.include?("staticsync::static_master") -%>
 file=/etc/static-clients.conf
 <% elsif classes.include?("roles::static_source") -%>
 file=/etc/static-clients.conf
@@ -185,7 +185,7 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or classes.include?("roles::static_master")  -%>
+<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or classes.include?("staticsync::static_master")  -%>
 file=/etc/ssh/userkeys
 file=/etc/ssh/userkeys/staticsync
 <% end -%>
diff --git a/modules/tcp_bbr/manifests/init.pp b/modules/tcp_bbr/manifests/init.pp
index 90b0e5372..a7ae47803 100644
--- a/modules/tcp_bbr/manifests/init.pp
+++ b/modules/tcp_bbr/manifests/init.pp
@@ -24,7 +24,7 @@ class tcp_bbr {
 		   has_role('security_mirror') or
 		   has_role('security_upload') or
 		   has_role('ssh.upload.d.o') or
-		   defined(Class["roles::static_master"]) or
+		   defined(Class["staticync::static_master"]) or
 		   has_role('static_mirror') or
 		   has_role('static_source') or
 		   has_role('syncproxy') or