diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -3588,3 +3588,5 @@ prometheus::elasticsearch::exporter::version: "%{lookup('elastic::elk_version')}.0" nodejs::version: 14.x + +swh::provenance::db::shared_buffers: 32GB \ No newline at end of file diff --git a/data/deployments/production/vagrant.yaml b/data/deployments/production/vagrant.yaml --- a/data/deployments/production/vagrant.yaml +++ b/data/deployments/production/vagrant.yaml @@ -1,3 +1,4 @@ elasticsearch::jvm_options::heap_size: 512m swh::postgresql::shared_buffers: 128MB +swh::provenance::db::shared_buffers: 128MB \ No newline at end of file diff --git a/data/hostname/met.internal.softwareheritage.org.yaml b/data/hostname/met.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/met.internal.softwareheritage.org.yaml @@ -0,0 +1,68 @@ +backups::exclude: + - var/lib/rabbitmq + +users: + ardumont: + groups: + - docker + aeviso: + groups: + - sudo + - docker + ddouard: + groups: + - sudo + - docker + jayesh: + groups: + - sudo + - docker + olasd: + groups: + - docker + vsellier: + groups: + - docker + zack: + groups: + - docker + +icinga2::host::vars: + load: high + +swh::apt_config::enable_non_free: true +packages: + - intel-microcode + # install zfs + - zfs-dkms + +rabbitmq::python_package: 'python3' + +swh::postgresql::version: 13 +# hack to don't hang in bullseye +postgresql::globals::version: "%{lookup('swh::postgresql::version')}" + +swh::postgresql::listen_addresses: + - 0.0.0.0 +swh::postgresql::port: 5433 +swh::postgresql::cluster_name: "%{lookup('swh::postgresql::version')}/main" +swh::postgresql::datadir_base: "%{lookup('swh::base_directory')}/postgres" +swh::postgresql::datadir: "%{lookup('swh::postgresql::datadir_base')}/%{lookup('swh::postgresql::cluster_name')}" +swh::postgresql::network_accesses: + - 192.168.100.0/24 # Monitoring + - 192.168.100.0/24 # Internal network + +# using an indirection to allow the override for vagrant +swh::postgresql::shared_buffers: "%{lookup('swh::provenance::db::shared_buffers')}" + +postgresql::server::config_entries: + shared_buffers: "%{alias('swh::postgresql::shared_buffers')}" + cluster_name: "%{alias('swh::postgresql::cluster_name')}" + + +swh::dbs: + storage: + name: swh-provenance + user: swh-provenance + + diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -1,4 +1,8 @@ --- +dns::local_nameservers: + - 192.168.100.29 + - 192.168.200.22 + # forwarder for : # - swh network # - Inria network @@ -129,6 +133,8 @@ host: search-esnode6.internal.softwareheritage.org 10.168.100.95: host: counters1.internal.softwareheritage.org + 10.168.100.101: + host: uffizi.internal.softwareheritage.org 10.168.100.104: host: saatchi.internal.softwareheritage.org aliases: @@ -137,12 +143,12 @@ host: kelvingrove.internal.softwareheritage.org aliases: - auth.softwareheritage.org - 10.168.100.101: - host: uffizi.internal.softwareheritage.org 10.168.100.108: host: branly.internal.softwareheritage.org 10.168.100.109: host: saam.internal.softwareheritage.org + 10.168.100.110: + host: met.internal.softwareheritage.org 10.168.100.131: host: zookeeper1.internal.softwareheritage.org 10.168.100.132: diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -66,6 +66,10 @@ include role::swh_graph_backend } +node 'met.internal.softwareheritage.org' { + include role::swh_provenance +} + node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ { include role::swh_vault } diff --git a/site-modules/role/manifests/swh_provenance.pp b/site-modules/role/manifests/swh_provenance.pp new file mode 100644 --- /dev/null +++ b/site-modules/role/manifests/swh_provenance.pp @@ -0,0 +1,15 @@ +# SWH provenance backend server +class role::swh_provenance inherits role::swh_server { + + include profile::rabbitmq + + include profile::postgresql + include profile::postgresql::server + include profile::pgbouncer + include profile::postgresql::client + include profile::prometheus::sql + + include profile::docker +} + +