From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 07:29:00 +0000 (+0200)
Subject: Only setup ssh in static_source if we are not also a static_master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f6aa812be86c0ecb966bc77bcd31d7824635f879;p=mirror%2Fdsa-puppet.git

Only setup ssh in static_source if we are not also a static_master
---

diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
index 3ff15e89f..960366cf9 100644
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@ -4,9 +4,16 @@
 class roles::static_source {
   include roles::static::base
 
-  # sources talk only to masters
-  class { 'roles::static::ssh':
-    add_tag     => 'staticsync-master',
-    collect_tag => 'staticsync-source',
+  if ! defined(Class["roles::static_master"]) {
+    # sources talk only to masters, but only set this up if we are not
+    # *also* a static master since we cannot have two meaningful roles::static:ssh
+    # instances in the current setup.
+    #
+    # this adds the limitation that the master of any component whose source is also a
+    # master node needs to have that same host as its master and not some other one.
+    class { 'roles::static::ssh':
+      add_tag     => 'staticsync-master',
+      collect_tag => 'staticsync-source',
+    }
   }
 }