diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2018-08-04 09:58:40 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2018-08-04 09:58:40 +0000 |
| commit | b5aef4cacfbb2e8504a25d509c316c1697ccd304 (patch) | |
| tree | 19ac223e88d0b733c3ef69e19d7855a90d5fe6a0 | |
| parent | 3c3b19a5a09734f7316d27ad2089a5d82127b50a (diff) | |
| download | puppet-b5aef4cacfbb2e8504a25d509c316c1697ccd304.tar puppet-b5aef4cacfbb2e8504a25d509c316c1697ccd304.tar.gz puppet-b5aef4cacfbb2e8504a25d509c316c1697ccd304.tar.bz2 puppet-b5aef4cacfbb2e8504a25d509c316c1697ccd304.tar.xz puppet-b5aef4cacfbb2e8504a25d509c316c1697ccd304.zip | |
Add scwx86 node
| -rwxr-xr-x | deployment/dns/templates/mageia.org.zone | 2 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 6 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 3d6887c3..39d53c5f 100755 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -131,5 +131,7 @@ ecosse1 IN CNAME ecosse rabbit0 IN CNAME rabbit rabbit1 IN CNAME rabbit rabbit2 IN CNAME rabbit +scwx861 IN CNAME scwx86 +scwx862 IN CNAME scwx86 <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index f21989fa..565bfbdf 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -37,8 +37,8 @@ class mga_buildsystem::config { 'ecosse1' => "ecosse.${::domain}", 'rabbit0' => "rabbit.${::domain}", 'rabbit1' => "rabbit.${::domain}", - 'scwx861' => '0228fd04-4168-431a-a696-c8c1ea433dd9.pub.cloud.scaleway.com', - 'scwx862' => '0228fd04-4168-431a-a696-c8c1ea433dd9.pub.cloud.scaleway.com', + 'scwx861' => "scwx86.${::domain}", + 'scwx862' => "scwx86.${::domain}", }, build_src_node => 'duvel', } @@ -166,7 +166,7 @@ class mga_buildsystem::config { $::nodes_ipaddr[neru][ipv4], $::nodes_ipaddr[neru][ipv6], '2001:bc8:4400:2700::2729', - '2001:bc8:4400:2000::1a1d', + $::nodes_ipaddr[scwx86][ipv6], ] $repo_allow_from_domains = [ ".${::domain}", diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 0086a67c..8fd78e13 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -52,6 +52,9 @@ $nodes_ipaddr = { friteuse => { ipv4 => '192.168.122.131', } + scwx86 => { + ipv6 => '2001:bc8:4400:2000::1a1d', + } } # vim: sw=2 |