From 0315b541506e365f96f2bf4bc4620fbfd333b80a Mon Sep 17 00:00:00 2001
From: Olivier Blin <dev@blino.org>
Date: Mon, 23 Nov 2015 00:30:27 +0100
Subject: buildsystem: stop using include in DSL files to avoid error on Mageia
 5

include is not support from DSL files in puppet 3.6

Note: DSL support is deprecated in 3.x and completely removed in 4.x
---
 modules/buildsystem/manifests/create_upload_dir.rb | 2 --
 modules/buildsystem/manifests/distros.rb           | 4 ----
 modules/buildsystem/manifests/mainnode.pp          | 2 ++
 modules/buildsystem/manifests/mgarepo.pp           | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb
index 270a9285..8023ab5d 100644
--- a/modules/buildsystem/manifests/create_upload_dir.rb
+++ b/modules/buildsystem/manifests/create_upload_dir.rb
@@ -1,6 +1,4 @@
 hostclass "buildsystem::create_upload_dir" do
-    include 'buildsystem::var::scheduler'
-    include 'buildsystem::var::distros'
     states = ["todo","done","failure","queue","rejected"]
     owner = scope.lookupvar('buildsystem::var::scheduler::login')
     group = owner
diff --git a/modules/buildsystem/manifests/distros.rb b/modules/buildsystem/manifests/distros.rb
index b383717b..5301944d 100644
--- a/modules/buildsystem/manifests/distros.rb
+++ b/modules/buildsystem/manifests/distros.rb
@@ -1,8 +1,4 @@
 hostclass "buildsystem::distros" do
-    include 'buildsystem::var::repository'
-    include 'buildsystem::var::scheduler'
-    include 'buildsystem::var::distros'
-
     mirror_user = 'root'
     schedbot_user = scope.lookupvar('buildsystem::var::scheduler::login')
     bootstrap_reporoot = scope.lookupvar('buildsystem::var::repository::bootstrap_reporoot')
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp
index 0dd37486..01de764f 100644
--- a/modules/buildsystem/manifests/mainnode.pp
+++ b/modules/buildsystem/manifests/mainnode.pp
@@ -1,5 +1,7 @@
 class buildsystem::mainnode {
     include buildsystem::var::repository
+    include buildsystem::var::scheduler
+    include buildsystem::var::distros
     include buildsystem::iurt::user
     include buildsystem::scheduler
     include buildsystem::gatherer
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index cab4315a..2b314d3d 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -1,5 +1,6 @@
 class buildsystem::mgarepo {
     include buildsystem::var::scheduler
+    include buildsystem::var::distros
     include buildsystem::var::groups
     include buildsystem::var::binrepo
     include buildsystem::create_upload_dir
-- 
cgit v1.2.1