diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml --- a/data/deployments/staging/common.yaml +++ b/data/deployments/staging/common.yaml @@ -202,13 +202,6 @@ indexer::storage: name: swh-indexer user: swh-indexer - clearly_defined: - name: clearly-defined - user: clearly-defined - clearly_defined_full: - name: clearly-defined-full - user: clearly-defined - password: "%{lookup('swh::deploy::clearly_defined::db::password')}" webapp: name: swh-web user: swh-web @@ -247,16 +240,6 @@ auth_user: postgres port: 5433 alias: staging-swh-indexer - - source_db: clearly-defined - host: localhost - auth_user: postgres - port: 5433 - alias: staging-clearly-defined - - source_db: clearly-defined-full - host: localhost - auth_user: postgres - port: 5433 - alias: staging-clearly-defined-full - source_db: swh-web host: localhost auth_user: postgres diff --git a/data/hostname/clearly-defined.internal.staging.swh.network.yaml b/data/hostname/clearly-defined.internal.staging.swh.network.yaml deleted file mode 100644 --- a/data/hostname/clearly-defined.internal.staging.swh.network.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -swh::postgres::service::users: - - tg1999 - - root - - olasd - - vlorentz - - zack - -swh::postgres::service::dbs: - - alias: clearly-defined - name: clearly-defined - host: "%{alias('swh::deploy::storage::db::host')}" - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - user: guest - password: guest - - alias: admin-clearly-defined - name: clearly-defined - host: "%{alias('swh::deploy::storage::db::host')}" - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - user: clearly-defined - password: "%{alias('swh::deploy::clearly_defined::db::password')}" - - alias: clearly-defined-full - name: clearly-defined-full - host: "%{alias('swh::deploy::storage::db::host')}" - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - user: guest - password: guest - - alias: admin-clearly-defined-full - name: clearly-defined-full - host: "%{alias('swh::deploy::storage::db::host')}" - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - user: clearly-defined - password: "%{alias('swh::deploy::clearly_defined::db::password')}" - - alias: replica-swh - name: softwareheritage - host: somerset.internal.softwareheritage.org - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - user: guest - password: guest - - diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -170,5 +170,3 @@ host: worker3.internal.staging.swh.network 10.168.130.110: host: objstorage0.internal.staging.swh.network - 10.168.130.200: - host: clearly-defined.internal.staging.swh.network diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -203,10 +203,6 @@ include role::swh_netbox } -node 'clearly-defined.internal.staging.swh.network' { - include role::swh_db_client -} - node default { include role::swh_base }