buildsystem: Change youri submit configuration

The youri submit configuration has been changed. The following two
template files :
 - youri/submit-todo.conf
 - youri/submit-upload.conf
have been replaced by a common template file for youri submit-todo and
youri submit-upload :
 - youri/submit.conf

This new template file does not contain any specific configuration.
Instead the youri configuration is now created using informations from
the following hash variables :
 - the $youri_conf_default hash from buildsystem::var::youri, containing
   default configuration for the repository, the checks, actions and
   posts.
 - the $youri_conf parameter from buildsystem::var::youri, overriding
   infos from the default configuration defined in $youri_conf_default.
 - the distros specific configuration is defined in the $distros
   parameter from buildsystem::var::distros.
All those variables contain configuration for both youri submit-todo
and youri submit-upload.

This change allows moving all Mageia specific configuration outside the
buildsystem module to the class mga_buildsystem::config, while still
keeping common configuration in the buildsystem module.

The following checks definitions have also been removed from youri
submit-todo configuration, because they are not used in the current
configuration :
 - history
 - precedence
 - section
 - svn

The 'version' check options for infra_1 and infra_2 have been moved from
youri submit-upload to submit-todo configuration.

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp
index f55402d8..f4e49412 100644
--- a/modules/buildsystem/manifests/youri_submit.pp
+++ b/modules/buildsystem/manifests/youri_submit.pp
@@ -24,14 +24,17 @@ class buildsystem::youri_submit {
     file {
         '/etc/youri/':
             ensure => 'directory';
-        '/etc/youri/submit-todo.conf':
-            content => template($buildsystem::var::youri::tmpl_youri_todo_conf);
-        '/etc/youri/submit-upload.conf':
-            content => template($buildsystem::var::youri::tmpl_youri_upload_conf);
         '/etc/youri/acl.conf':
             content => template('buildsystem/youri/acl.conf');
     }
 
+    buildsystem::youri_submit_conf{ 'upload':
+	tmpl_file => $buildsystem::var::youri::tmpl_youri_upload_conf,
+    }
+    buildsystem::youri_submit_conf{ 'todo':
+    	tmpl_file => $buildsystem::var::youri::tmpl_youri_todo_conf,
+    }
+
     file { $buildsystem::var::youri::packages_archivedir:
         ensure  => 'directory',
         owner   => $buildsystem::var::scheduler::login,