diff options
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 5 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/sucuk.pp | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index e9e3b034..7fe56239 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -7,7 +7,7 @@ ; $Id$ $TTL 30m @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2016020701 ; Serial + 2016030101 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -125,8 +125,5 @@ ecosse1 IN CNAME ecosse rabbit0 IN CNAME rabbit rabbit1 IN CNAME rabbit rabbit2 IN CNAME rabbit -sucuk0 IN CNAME sucuk -sucuk1 IN CNAME sucuk -sucuk2 IN CNAME sucuk <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 118caf01..2c423563 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -25,8 +25,8 @@ class mga_buildsystem::config { class { 'buildsystem::var::scheduler' : admin_mail => "sysadmin@group.${::domain}", build_nodes => { - 'i586' => [ 'ecosse0', 'sucuk0', 'ecosse1', 'sucuk1', 'sucuk2' ], - 'x86_64' => [ 'sucuk0', 'ecosse1', 'sucuk1', 'ecosse0', 'sucuk2' ], + 'i586' => [ 'ecosse0', 'ecosse1', ], + 'x86_64' => [ 'ecosse0', 'ecosse1', ], 'armv5tl' => [ 'armorique', 'armagnac', 'armada' ], }, build_nodes_aliases => { @@ -36,9 +36,6 @@ class mga_buildsystem::config { 'ecosse1' => "ecosse.${::domain}", 'rabbit0' => "rabbit.${::domain}", 'rabbit1' => "rabbit.${::domain}", - 'sucuk0' => "sucuk.${::domain}", - 'sucuk1' => "sucuk.${::domain}", - 'sucuk2' => "sucuk.${::domain}", }, build_src_node => 'duvel', } diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp index 683be38e..9789fd97 100644 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp @@ -6,5 +6,4 @@ node sucuk { include openssh::ssh_keys_from_ldap include access_classes::admin - include mga_buildsystem::buildnode } |