X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_source.pp;h=3e66d34328f88953636566ff14035e43ecb2a456;hb=7b5f8bd99839bcbd9080209121f58f9aee5a9831;hp=960366cf9602f0eb085adcfa59e84909fc9ec7ac;hpb=f6aa812be86c0ecb966bc77bcd31d7824635f879;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
index 960366cf9..3e66d3432 100644
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@ -1,19 +1,4 @@
-# a static source
-#
-# 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
-
-  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',
-    }
-  }
+class roles::static_source(
+) {
+  include staticsync::static_source
 }