diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-02-11 16:07:17 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-02-11 16:07:17 +0000 |
| commit | 8be5f2ab98d9e63adee5474391f16e8c9b9d486e (patch) | |
| tree | 2cdebff6530467280b605f2844039048a027f8ee /deployment | |
| parent | c23d6f477a96586c51a6fa31026270c697490e45 (diff) | |
| download | puppet-8be5f2ab98d9e63adee5474391f16e8c9b9d486e.tar puppet-8be5f2ab98d9e63adee5474391f16e8c9b9d486e.tar.gz puppet-8be5f2ab98d9e63adee5474391f16e8c9b9d486e.tar.bz2 puppet-8be5f2ab98d9e63adee5474391f16e8c9b9d486e.tar.xz puppet-8be5f2ab98d9e63adee5474391f16e8c9b9d486e.zip | |
Add ec2x2
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 4 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 50d81eb1..26bd0861 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. ( - 2020020901 ; Serial + 2020021101 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -128,5 +128,7 @@ ec2aa3-a IN CNAME ec2aa3 ec2aa3-b IN CNAME ec2aa3 ec2x1-a IN CNAME ec2x1 ec2x1-b IN CNAME ec2x1 +ec2x2-a IN CNAME ec2x2 +ec2x2-b IN CNAME ec2x2 <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 6c641bca..11e7a774 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -26,8 +26,8 @@ class mga_buildsystem::config { class { 'buildsystem::var::scheduler' : admin_mail => "sysadmin@group.${::domain}", build_nodes => { - 'i586' => [ 'ecosse0', 'rabbit0', 'ec2x1-a', 'ecosse1', 'rabbit1', 'ec2x1-b', 'rabbit2' ], - 'x86_64' => [ 'rabbit0', 'ecosse0', 'ec2x1-a', 'rabbit1', 'ecosse1', 'ec2x1-b', 'rabbit2' ], + 'i586' => [ 'ecosse0', 'rabbit0', 'ec2x1-a', 'ec2x2-a', 'ecosse1', 'rabbit1', 'ec2x1-b', 'rabbit2', 'ec2x2-b' ], + 'x86_64' => [ 'rabbit0', 'ecosse0', 'ec2x1-a', 'ec2x2-a', 'rabbit1', 'ecosse1', 'ec2x1-b', 'rabbit2', 'ec2x2-b' ], 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ], 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ], }, @@ -44,6 +44,8 @@ class mga_buildsystem::config { 'ec2aa3-b' => "ec2aa3.${::domain}", 'ec2x1-a' => "ec2x1.${::domain}", 'ec2x1-b' => "ec2x1.${::domain}", + 'ec2x2-a' => "ec2x2.${::domain}", + 'ec2x2-b' => "ec2x2.${::domain}", }, build_src_node => 'duvel', } |