diff --git a/data/hostname/prado.softwareheritage.org.yaml b/data/hostname/prado.softwareheritage.org.yaml deleted file mode 100644 --- a/data/hostname/prado.softwareheritage.org.yaml +++ /dev/null @@ -1,20 +0,0 @@ -dar::backup::exclude: - - srv/softwareheritage/postgres - - srv/softwareheritage/postgres-hdd - -icinga2::host::vars: - load: high - -prometheus::sql::config_snippets: - - swh-scheduler - - swh-storage - -pgbouncer::auth_hba_file: /etc/postgresql/10/secondary/pg_hba.conf -pgbouncer::listen_addr: 192.168.100.100 -pgbouncer::databases: - # swh - - source_db: "%{hiera('swh::deploy::storage::db::dbname')}" - host: prado.internal.softwareheritage.org - auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}" - port: "%{hiera('swh::deploy::db::main::port')}" - diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -27,12 +27,7 @@ include role::swh_scheduler } -node /^(prado|somerset).(internal.)?softwareheritage.org$/ { - include role::swh_database - include profile::pgbouncer -} - -node 'belvedere.internal.softwareheritage.org' { +node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database include profile::pgbouncer }