Create buildsystem::var::distros

buildsystem::var::distros will be used to store the list of
distributions and their configuration, medias, etc ... The list of
distributions and medias has been removed from buildsystem::mgarepo and
moved to mga_buildsystem::config.

1 files changed, 9 insertions, 7 deletions

diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb
index dcd27afe..f3e16a3e 100644
--- a/modules/buildsystem/manifests/create_upload_dir.rb
+++ b/modules/buildsystem/manifests/create_upload_dir.rb
@@ -1,4 +1,6 @@
 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
@@ -9,17 +11,17 @@ hostclass "buildsystem::create_upload_dir" do
     for st in states do
         file [uploads_dir, st].join('/'), :ensure => 'directory', :owner => owner, :group => group 
         
-        scope.lookupvar('buildsystem::mgarepo::releases').each{|rel, repositories|
+        scope.lookupvar('buildsystem::var::distros::distros').each{|rel, distro|
             file [uploads_dir, st, rel].join('/'), :ensure => 'directory', :owner => owner, :group => group
+	    medias = distro['medias']
+            medias.each{|media, repos|
+                file [uploads_dir, st, rel, media].join('/'), :ensure => 'directory', :owner => owner, :group => group
         
-            repositories.each{|rep, medias|
-                file [uploads_dir, st, rel, rep].join('/'), :ensure => 'directory', :owner => owner, :group => group
-        
-                for med in medias do
+                for repo in repos do
                     if st == 'done'
-                       file [uploads_dir, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => owner, :group => group, :mode => 0775
+                       file [uploads_dir, st, rel, media, repo].join('/'), :ensure => 'directory', :owner => owner, :group => group, :mode => 0775
                     else
-                       file [uploads_dir, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => owner, :group => group
+                       file [uploads_dir, st, rel, media, repo].join('/'), :ensure => 'directory', :owner => owner, :group => group
                     end
                 end 
             }