diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml index 032bd785..f2f094bb 100644 --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -1,44 +1,110 @@ --- # forwarder for : # - swh network # - Inria network # - external network dns::forwarders: - 192.168.100.29 - 192.168.200.22 - 128.93.77.234 - 1.1.1.1 dns::forwarder_insecure: true ntp::servers: - sesi-ntp1.inria.fr - sesi-ntp2.inria.fr networks::manage_interfaces: false internal_network: 10.168.128.0/16 networks::private_routes: {} smtp::relay_hostname: 'none' swh::deploy::worker::instances: - checker_deposit - lister - loader_archive - loader_cran - loader_debian - loader_deposit - loader_git - loader_mercurial - loader_nixguix - loader_npm - loader_pypi - loader_svn dns::forward_zones: { } netbox::vhost::letsencrypt_cert: inventory-vagrant netbox::vhost::name: inventory-vagrant.internal.softwareheritage.org netbox::mail::from: inventory+vagrant@softwareheritage.org netbox::admin::email: sysop+vagrant@softwareheritage.org + +static_hostnames: + 10.168.100.18: + host: banco.internal.softwareheritage.org + aliases: + - backup.internal.softwareheritage.org + - kibana.internal.softwareheritage.org + 10.168.100.19: + host: logstash0.internal.softwareheritage.org + aliases: + - logstash.internal.softwareheritage.org + 10.168.100.29: + host: pergamon.internal.softwareheritage.org + aliases: + - icinga.internal.softwareheritage.org + - grafana.softwareheritage.org + - stats.export.softwareheritage + 10.168.100.30: + host: jenkins.softwareheritage.org + 10.168.100.31: + host: moma.internal.softwareheritage.org + aliases: + - archive.internal.softwareheritage.org + - deposit.internal.softwareheritage.org + 10.168.100.52: + host: riverside.internal.softwareheritage.org + aliases: + - sentry.softwareheritage.org + 10.168.100.61: + host: esnode1.internal.softwareheritage + 10.168.100.62: + host: esnode2.internal.softwareheritage + 10.168.100.63: + host: esnode3.internal.softwareheritage + 10.168.100.101: + host: uffizi.internal.softwareheritage.org + 10.168.100.104: + host: saatchi.internal.softwareheritage.org + aliases: + - rabbitmq.internal.softwareheritage.org + 10.168.100.106: + host: kelvingrove.internal.softwareheritage.org + aliases: + - auth.softwareheritage.org + 10.168.100.210: + host: belvedere.internal.softwareheritage.org + aliases: + - db.internal.softwareheritage.org + 10.168.100.199: + host: bojimans.internal.softwareheritage.org + aliases: + - inventory.internal.softwareheritage.org + 10.168.130.11: + host: db1.internal.staging.swh.network + 10.168.130.30: + host: webapp.internal.staging.swh.network + 10.168.130.31: + host: deposit.internal.staging.swh.network + 10.168.130.41: + host: storage1.internal.staging.swh.network + 10.168.130.50: + host: scheduler0.internal.staging.swh.network + 10.168.130.60: + host: vault.internal.staging.swh.network + 10.168.130.70: + host: journal0.internal.staging.swh.network diff --git a/site-modules/profile/manifests/static_hostnames.pp b/site-modules/profile/manifests/static_hostnames.pp new file mode 100644 index 00000000..614e1cbd --- /dev/null +++ b/site-modules/profile/manifests/static_hostnames.pp @@ -0,0 +1,13 @@ +# Declare the /etc/hosts entries +class profile::static_hostnames { + + $static_hostnames = lookup('static_hostnames', {default_value => {}}) + + each($static_hostnames) |$ip, $properties| { + host {$properties['host'] : + ensure => present, + ip => $ip, + host_aliases => $properties['aliases'] + } + } +} diff --git a/site-modules/role/manifests/swh_base.pp b/site-modules/role/manifests/swh_base.pp index addb92d2..c495961c 100644 --- a/site-modules/role/manifests/swh_base.pp +++ b/site-modules/role/manifests/swh_base.pp @@ -1,19 +1,21 @@ class role::swh_base { + include profile::static_hostnames + include profile::base include profile::ssh::server include profile::unbound include profile::systemd_journal include profile::resolv_conf include profile::puppet include profile::prometheus::node include profile::prometheus::statsd include profile::icinga2 include profile::rsyslog if $::virtual == 'physical' { include profile::megacli } include profile::network include profile::swh }