diff options
| author | Olivier Blin <dev@blino.org> | 2015-11-23 00:30:27 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2015-11-30 01:32:43 +0100 |
| commit | 0315b541506e365f96f2bf4bc4620fbfd333b80a (patch) | |
| tree | b5635558c723bf7a818b8573d102ab4617cd1a68 | |
| parent | cd3a41f82d8ee36aaa0716ab2f7c400b89b5b901 (diff) | |
| download | puppet-0315b541506e365f96f2bf4bc4620fbfd333b80a.tar puppet-0315b541506e365f96f2bf4bc4620fbfd333b80a.tar.gz puppet-0315b541506e365f96f2bf4bc4620fbfd333b80a.tar.bz2 puppet-0315b541506e365f96f2bf4bc4620fbfd333b80a.tar.xz puppet-0315b541506e365f96f2bf4bc4620fbfd333b80a.zip | |
buildsystem: stop using include in DSL files to avoid error on Mageia 5topic/mageia5
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
| -rw-r--r-- | modules/buildsystem/manifests/create_upload_dir.rb | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/distros.rb | 4 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/mainnode.pp | 2 | ||||
| -rw-r--r-- | 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 |