diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2018-10-18 14:41:08 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2018-10-18 14:41:08 +0000 |
| commit | 94b6b9a157bbecc6f649a25094c10d4db8ff734e (patch) | |
| tree | ddd762d2b1bcdd3d753dbdd077d45493916e15ab | |
| parent | 10e5f2a48d8fa8507a4124a83173e54a646f0fcf (diff) | |
| download | puppet-94b6b9a157bbecc6f649a25094c10d4db8ff734e.tar puppet-94b6b9a157bbecc6f649a25094c10d4db8ff734e.tar.gz puppet-94b6b9a157bbecc6f649a25094c10d4db8ff734e.tar.bz2 puppet-94b6b9a157bbecc6f649a25094c10d4db8ff734e.tar.xz puppet-94b6b9a157bbecc6f649a25094c10d4db8ff734e.zip | |
Upgrade scwx86 to a larger model
This unfortunately means changing the IPv6
| -rwxr-xr-x | deployment/dns/templates/mageia.org.zone | 3 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 703cb393..fc1b90ef 100755 --- 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. ( - 2018092001 ; Serial + 2018101801 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -133,6 +133,7 @@ rabbit1 IN CNAME rabbit rabbit2 IN CNAME rabbit scwx861 IN CNAME scwx86 scwx862 IN CNAME scwx86 +scwx863 IN CNAME scwx86 scwaarch641 IN CNAME scwaarch64 scwaarch642 IN CNAME scwaarch64 scwaarch644 IN CNAME scwaarch643 diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 7b1bf023..6684ff0c 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', 'ecosse1', 'rabbit1', 'scwx861', 'rabbit2', 'scwx862' ], - 'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'scwx861', 'rabbit2', 'scwx862' ], + 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], + 'x86_64' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'armv5tl' => [ 'armorique', 'armagnac', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ], 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armorique', 'armagnac', 'armlet8', 'armlet9' ], 'aarch64' => [ 'scwaarch641', 'scwaarch642', 'scwaarch643', 'scwaarch644' ], @@ -41,6 +41,7 @@ class mga_buildsystem::config { 'rabbit1' => "rabbit.${::domain}", 'scwx861' => "scwx86.${::domain}", 'scwx862' => "scwx86.${::domain}", + 'scwx863' => "scwx86.${::domain}", 'scwaarch641' => "scwaarch64.${::domain}", 'scwaarch642' => "scwaarch64.${::domain}", 'scwaarch644' => "scwaarch643.${::domain}", diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 43df3752..e44dd2b7 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -53,7 +53,7 @@ $nodes_ipaddr = { ipv4 => '192.168.122.131', }, scwx86 => { - ipv6 => '2001:bc8:4400:2000::1a1d', + ipv6 => '2001:bc8:4400:2800::4623', }, scwaarch64 => { ipv6 => '2001:bc8:4400:2700::245d', |