diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2019-12-10 18:56:19 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2019-12-10 18:57:16 +0000 |
| commit | 2d3fd95aa23785ba27754791250007b6dfc680e7 (patch) | |
| tree | ab9cfcea9a8821b3b527cf1b550c5558eb409652 | |
| parent | 5f37413245039ef5ffe32a7e55c67235af521ebb (diff) | |
| download | puppet-2d3fd95aa23785ba27754791250007b6dfc680e7.tar puppet-2d3fd95aa23785ba27754791250007b6dfc680e7.tar.gz puppet-2d3fd95aa23785ba27754791250007b6dfc680e7.tar.bz2 puppet-2d3fd95aa23785ba27754791250007b6dfc680e7.tar.xz puppet-2d3fd95aa23785ba27754791250007b6dfc680e7.zip | |
Add armlet4 and remove armlet8
armlet{1,2,3,4,5} are now running Mageia 7
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 4 | ||||
| -rw-r--r-- | manifests/nodes/armlet1.pp (renamed from manifests/nodes/armlet8.pp) | 2 | ||||
| -rw-r--r-- | manifests/nodes/armlet2.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet4.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 4 |
5 files changed, 19 insertions, 5 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 6aae2947..37376d3b 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' => [ 'armorique', 'armlet3', 'armlet5', 'armlet8' ], - 'armv7hl' => [ 'armorique', 'armlet1', 'armlet2', 'armlet3', 'armlet5', 'armlet8' ], + 'armv5tl' => [ 'armorique', 'armlet3', 'armlet5' ], + 'armv7hl' => [ 'armorique', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], 'aarch64' => [ 'scwaarch641', 'scwaarch643', 'scwaarch645', 'scwaarch642', 'scwaarch644', 'scwaarch646' ], }, build_nodes_aliases => { diff --git a/manifests/nodes/armlet8.pp b/manifests/nodes/armlet1.pp index becbf79f..0d731f08 100644 --- a/manifests/nodes/armlet8.pp +++ b/manifests/nodes/armlet1.pp @@ -1,4 +1,4 @@ -node armlet8 { +node armlet1 { # Location: Scaleway (Iliad/Online datacenter) # include common::default_mageia_server diff --git a/manifests/nodes/armlet2.pp b/manifests/nodes/armlet2.pp new file mode 100644 index 00000000..7566249f --- /dev/null +++ b/manifests/nodes/armlet2.pp @@ -0,0 +1,7 @@ +node armlet2 { +# 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 new file mode 100644 index 00000000..f3e5be64 --- /dev/null +++ b/manifests/nodes/armlet4.pp @@ -0,0 +1,7 @@ +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_ip.pp b/manifests/nodes_ip.pp index 80a00206..2d2260ab 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -37,10 +37,10 @@ $nodes_ipaddr = { armlet3 => { ipv4 => '163.172.148.228', }, - armlet5 => { + armlet4 => { ipv4 => '163.172.148.228', }, - armlet8 => { + armlet5 => { ipv4 => '163.172.148.228', }, friteuse => { |