diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2022-07-14 19:45:03 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2022-07-14 19:46:23 +0000 |
| commit | 44222e4c2bc7028d63fdf5e5d59059d5ee27241e (patch) | |
| tree | b8c139affd3958bb9fb4417cb64db29d3513b22f | |
| parent | 1ef87173139760a23563e139243529a15d1e9144 (diff) | |
| download | puppet-44222e4c2bc7028d63fdf5e5d59059d5ee27241e.tar puppet-44222e4c2bc7028d63fdf5e5d59059d5ee27241e.tar.gz puppet-44222e4c2bc7028d63fdf5e5d59059d5ee27241e.tar.bz2 puppet-44222e4c2bc7028d63fdf5e5d59059d5ee27241e.tar.xz puppet-44222e4c2bc7028d63fdf5e5d59059d5ee27241e.zip | |
Add Oracle Cloud build nodes
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 6 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 8 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index f456bdcd..a64e71c9 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. ( - 2022022201 ; Serial + 2022071401 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -136,5 +136,9 @@ pktaa1-c IN CNAME pktaa1 pktaa1-d IN CNAME pktaa1 pktaa1-e IN CNAME pktaa1 pktaa1-f IN CNAME pktaa1 +ociaa1-a IN CNAME ociaa1 +ociaa1-b IN CNAME ociaa1 +ociaa2-a IN CNAME ociaa2 +ociaa2-b IN CNAME ociaa2 <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 6a393008..b1984e6e 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', 'ecosse1', 'rabbit1', 'rabbit2' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1', 'rabbit2' ], - 'armv7hl' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f'], - 'aarch64' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f'], + 'armv7hl' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f', 'ociaa1-a', 'ociaa1-b', 'ociaa2-a','ociaa2-b'], + 'aarch64' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f', 'ociaa1-a', 'ociaa1-b', 'ociaa2-a','ociaa2-b'], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", @@ -52,6 +52,10 @@ class mga_buildsystem::config { 'pktaa1-d' => "pktaa1.${::domain}", 'pktaa1-e' => "pktaa1.${::domain}", 'pktaa1-f' => "pktaa1.${::domain}", + 'ociaa1-a' => "ociaa1.${::domain}", + 'ociaa1-b' => "ociaa1.${::domain}", + 'ociaa2-a' => "ociaa2.${::domain}", + 'ociaa2-b' => "ociaa2.${::domain}", }, build_src_node => 'duvel', } diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 1359f82c..4c18a516 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -54,6 +54,12 @@ $nodes_ipaddr = { }, pktaa1 => { ipv4 => '147.75.69.246', + }, + ociaa1 => { + ipv6 => '2603:c026:c101:f00::1:1', + }, + ociaa2 => { + ipv6 => '2603:c026:c101:f00::1:2', } } |