diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-01-12 20:27:59 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-01-12 20:27:59 +0000 |
| commit | c4228a23ce814460e41d8b820b556e007241e24d (patch) | |
| tree | 5f2502d2ac4e30dc1beaf741224147b6d3db0b68 | |
| parent | 7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0 (diff) | |
| download | puppet-c4228a23ce814460e41d8b820b556e007241e24d.tar puppet-c4228a23ce814460e41d8b820b556e007241e24d.tar.gz puppet-c4228a23ce814460e41d8b820b556e007241e24d.tar.bz2 puppet-c4228a23ce814460e41d8b820b556e007241e24d.tar.xz puppet-c4228a23ce814460e41d8b820b556e007241e24d.zip | |
Get rid of 3 armlet nodes
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 4 | ||||
| -rw-r--r-- | manifests/nodes/armlet3.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet4.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet5.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 9 |
5 files changed, 2 insertions, 32 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index ba484692..1a9af791 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -28,8 +28,8 @@ class mga_buildsystem::config { build_nodes => { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], - 'armv5tl' => [ 'armlet3', 'armlet5' ], - 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], + 'armv5tl' => [ 'armlet1', 'armlet2' ], + 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'armlet1', 'armlet2' ], 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'scwaarch641', 'scwaarch643', 'scwaarch642', 'scwaarch644' ], }, build_nodes_aliases => { diff --git a/manifests/nodes/armlet3.pp b/manifests/nodes/armlet3.pp deleted file mode 100644 index f3e5be64..00000000 --- a/manifests/nodes/armlet3.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet3 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet4.pp b/manifests/nodes/armlet4.pp deleted file mode 100644 index 10b0e0dd..00000000 --- a/manifests/nodes/armlet4.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet4 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet5.pp b/manifests/nodes/armlet5.pp deleted file mode 100644 index a4101d95..00000000 --- a/manifests/nodes/armlet5.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet5 { -# 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 7cd57e91..20b6ca8c 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -31,15 +31,6 @@ $nodes_ipaddr = { armlet2 => { ipv4 => '163.172.148.228', }, - armlet3 => { - ipv4 => '163.172.148.228', - }, - armlet4 => { - ipv4 => '163.172.148.228', - }, - armlet5 => { - ipv4 => '163.172.148.228', - }, friteuse => { ipv4 => '192.168.122.131', }, |