diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-01-27 22:48:43 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-01-27 22:48:43 +0000 |
| commit | ab73196b3878a6705453778e90baece8cac67e82 (patch) | |
| tree | 03b620e91881fdd6708e27fb6a39d54f13d7bbcf | |
| parent | d5c639bfe7c71331c49c8413918f098b097d75fc (diff) | |
| download | puppet-ab73196b3878a6705453778e90baece8cac67e82.tar puppet-ab73196b3878a6705453778e90baece8cac67e82.tar.gz puppet-ab73196b3878a6705453778e90baece8cac67e82.tar.bz2 puppet-ab73196b3878a6705453778e90baece8cac67e82.tar.xz puppet-ab73196b3878a6705453778e90baece8cac67e82.zip | |
Delete last scwaarch64 machine
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 4 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes/scwaarch64.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/scwaarch641.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 3 |
5 files changed, 2 insertions, 24 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 027db9f1..0ec552cd 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. ( - 2020012001 ; Serial + 2020012701 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -123,8 +123,6 @@ rabbit2 IN CNAME rabbit scwx861 IN CNAME scwx86 scwx862 IN CNAME scwx86 scwx863 IN CNAME scwx86 -scwaarch641 IN CNAME scwaarch64 -scwaarch642 IN CNAME scwaarch64 ec2aa1-a IN CNAME ec2aa1 ec2aa1-b IN CNAME ec2aa1 ec2aa2-a IN CNAME ec2aa2 diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 0ce0ce37..ec0b0310 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -29,7 +29,7 @@ class mga_buildsystem::config { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], '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', 'scwaarch641', 'scwaarch642' ], + 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", @@ -39,8 +39,6 @@ class mga_buildsystem::config { 'scwx861' => "scwx86.${::domain}", 'scwx862' => "scwx86.${::domain}", 'scwx863' => "scwx86.${::domain}", - 'scwaarch641' => "scwaarch64.${::domain}", - 'scwaarch642' => "scwaarch64.${::domain}", 'ec2aa1-a' => "ec2aa1.${::domain}", 'ec2aa1-b' => "ec2aa1.${::domain}", 'ec2aa2-a' => "ec2aa2.${::domain}", @@ -169,7 +167,6 @@ class mga_buildsystem::config { $::nodes_ipaddr[neru][ipv6], '2001:bc8:4400:2700::2729', $::nodes_ipaddr[scwx86][ipv6], - $::nodes_ipaddr[scwaarch64][ipv6], '147.75.83.250', '2604:1380:2000:f100::1', '2a05:d014:e9:2c00::/56', diff --git a/manifests/nodes/scwaarch64.pp b/manifests/nodes/scwaarch64.pp deleted file mode 100644 index 5f6a6b90..00000000 --- a/manifests/nodes/scwaarch64.pp +++ /dev/null @@ -1,7 +0,0 @@ -node scwaarch64 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/scwaarch641.pp b/manifests/nodes/scwaarch641.pp deleted file mode 100644 index 98d1a5a7..00000000 --- a/manifests/nodes/scwaarch641.pp +++ /dev/null @@ -1,7 +0,0 @@ -node scwaarch641 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index a993a02a..93f0d116 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -37,9 +37,6 @@ $nodes_ipaddr = { scwx86 => { ipv6 => '2001:bc8:4400:2000::5e29', }, - scwaarch64 => { - ipv6 => '2001:bc8:47c0:60d::1', - }, ec2aa1 => { ipv6 => '2a05:d014:e9:2c02:98ca:ec83:c601:371a', }, |