diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -241,6 +241,20 @@ host: objstorage0.internal.staging.swh.network 10.168.130.120: host: scrubber0.internal.staging.swh.network + 10.168.130.130: + host: elastic-worker0.internal.staging.swh.network + 10.168.130.131: + host: elastic-worker1.internal.staging.swh.network + 10.168.130.132: + host: elastic-worker2.internal.staging.swh.network + 10.168.130.133: + host: elastic-worker3.internal.staging.swh.network + 10.168.130.140: + host: rancher-node-intern0.internal.staging.swh.network + 10.168.130.141: + host: rancher-node-intern1.internal.staging.swh.network + 10.168.130.142: + host: rancher-node-intern2.internal.staging.swh.network 10.168.130.160: host: mirror-test.internal.staging.swh.network 10.168.200.22: diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -229,9 +229,12 @@ } node /^elastic-worker\d+\.internal\.staging\.swh\.network$/ { - include role::swh_worker_elastic + include role::rancher_node } +node /^rancher-node-.*\.internal\.(staging\.swh\.network|softwareheritage\.org)$/ { + include role::rancher_node +} node default { include role::swh_base diff --git a/site-modules/role/manifests/swh_worker_elastic.pp b/site-modules/role/manifests/rancher_node.pp rename from site-modules/role/manifests/swh_worker_elastic.pp rename to site-modules/role/manifests/rancher_node.pp --- a/site-modules/role/manifests/swh_worker_elastic.pp +++ b/site-modules/role/manifests/rancher_node.pp @@ -1,4 +1,4 @@ -class role::swh_worker_elastic inherits role::swh_base { +class role::rancher_node inherits role::swh_base { include profile::docker include profile::zfs::docker }