diff options
Diffstat (limited to 'deployment/mga_buildsystem')
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 6b7ceb2b..c0c62cc4 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -29,36 +29,18 @@ class mga_buildsystem::config { 'i586' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ], 'i686' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1', 'rabbit2' ], - 'armv7hl' => [ 'ociaa1-a', 'ociaa1-b'], - 'aarch64' => [ 'ociaa1-a', 'ociaa1-b'], + 'armv7hl' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'], + 'aarch64' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", 'ecosse1' => "ecosse.${::domain}", 'rabbit0' => "rabbit.${::domain}", 'rabbit1' => "rabbit.${::domain}", - 'ec2aa1-a' => "ec2aa1.${::domain}", - 'ec2aa1-b' => "ec2aa1.${::domain}", - 'ec2aa2-a' => "ec2aa2.${::domain}", - 'ec2aa2-b' => "ec2aa2.${::domain}", - 'ec2aa3-a' => "ec2aa3.${::domain}", - 'ec2aa3-b' => "ec2aa3.${::domain}", - 'ec2x1-a' => "ec2x1.${::domain}", - 'ec2x1-b' => "ec2x1.${::domain}", - 'ec2x2-a' => "ec2x2.${::domain}", - 'ec2x2-b' => "ec2x2.${::domain}", - 'pktaa1-a' => "pktaa1.${::domain}", - 'pktaa1-b' => "pktaa1.${::domain}", - 'pktaa1-c' => "pktaa1.${::domain}", - 'pktaa1-d' => "pktaa1.${::domain}", - 'pktaa1-e' => "pktaa1.${::domain}", - 'pktaa1-f' => "pktaa1.${::domain}", + 'rabbit2' => "rabbit.${::domain}", 'ociaa1-a' => "ociaa1.${::domain}", 'ociaa1-b' => "ociaa1.${::domain}", 'ociaa1-c' => "ociaa1.${::domain}", - 'ociaa2-a' => "ociaa2.${::domain}", - 'ociaa2-b' => "ociaa2.${::domain}", - 'ociaa2-c' => "ociaa2.${::domain}", }, build_src_node => 'duvel', } @@ -191,6 +173,8 @@ class mga_buildsystem::config { '2001:bc8:628:1f00::1', # Oracle cloud VMs '2603:c026:c101:f00::/64', + $::nodes_ipaddr[ncaa1][ipv4], + $::nodes_ipaddr[ncaa1][ipv6], ] $repo_allow_from_domains = [ ".${::domain}", @@ -223,7 +207,6 @@ class mga_buildsystem::config { 'archive', 'mail', 'maintdb', - 'rebuild', ], 'posts' => [ 'genhdlist2_zstd', |