X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_source.pp;h=960366cf9602f0eb085adcfa59e84909fc9ec7ac;hb=168aa3f05f914802698b8db5fdde823c4e992913;hp=b34db3f3d468b371b6a446ec67b5c75f4374494d;hpb=706a3d41c060de8527a6070e831c4e6b66fff099;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
index b34db3f3d..960366cf9 100644
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@ -2,5 +2,18 @@
 #
 # origin of static content.  From here it goes to the static master before that one pushes it to the mirrors
 class roles::static_source {
-  include roles::static_base
+  include roles::static::base
+
+  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',
+    }
+  }
 }