diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:37 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:37 +0000 |
commit | a2b2161af256fb557480c2fcf3b2f3e68538f5f2 (patch) | |
tree | c025f3780cfff4ee9ca0809ed8715f21f28e054d /modules | |
parent | b94f912e40602823ad977f3e5c6059fa3a2fccef (diff) | |
download | puppet-a2b2161af256fb557480c2fcf3b2f3e68538f5f2.tar puppet-a2b2161af256fb557480c2fcf3b2f3e68538f5f2.tar.gz puppet-a2b2161af256fb557480c2fcf3b2f3e68538f5f2.tar.bz2 puppet-a2b2161af256fb557480c2fcf3b2f3e68538f5f2.tar.xz puppet-a2b2161af256fb557480c2fcf3b2f3e68538f5f2.zip |
buildsystem: add $svn_root_packages_ssh parameter
Diffstat (limited to 'modules')
-rw-r--r-- | modules/buildsystem/manifests/var/mgarepo.pp | 3 | ||||
-rw-r--r-- | modules/buildsystem/templates/youri/submit-todo.conf | 2 | ||||
-rw-r--r-- | modules/buildsystem/templates/youri/submit-upload.conf | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/var/mgarepo.pp b/modules/buildsystem/manifests/var/mgarepo.pp index 52f9d9cc..9099c7ee 100644 --- a/modules/buildsystem/manifests/var/mgarepo.pp +++ b/modules/buildsystem/manifests/var/mgarepo.pp @@ -4,6 +4,8 @@ # hostname of the svn server used for packages # $svn_root_packages: # svn root url of the svn repository for packages +# $svn_root_packages_ssh: +# svn+ssh root url of the svn repository for packages # $oldurl: # svn url where the import logs of the rpm are stored # $conf: @@ -13,6 +15,7 @@ class buildsystem::var::mgarepo( $submit_host, $svn_hostname, $svn_root_packages, + $svn_root_packages_ssh, $oldurl, $conf ) { diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf index af126712..a575602e 100644 --- a/modules/buildsystem/templates/youri/submit-todo.conf +++ b/modules/buildsystem/templates/youri/submit-todo.conf @@ -16,7 +16,7 @@ repository: upload_state: todo done queue queue: todo noarch: i586 - svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ + svn: <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages_ssh') %>/<%= scope.lookupvar('buildsystem::var::distros::default_distro') %>/ 2: arch: i586 x86_64 1: diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf index fdd8fd63..305de6cd 100644 --- a/modules/buildsystem/templates/youri/submit-upload.conf +++ b/modules/buildsystem/templates/youri/submit-upload.conf @@ -18,7 +18,7 @@ repository: upload_state: queue queue: queue noarch: i586 - svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ + svn: <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages_ssh') %>/<%= scope.lookupvar('buildsystem::var::distros::default_distro') %>/ 2: arch: i586 x86_64 1: |