diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1009,7 +1009,8 @@ bind::autogenerate: 192.168.100.0/24: .internal.softwareheritage.org 192.168.200.0/21: .internal.softwareheritage.org - 192.168.128.0/24: .internal.staging.swh.network + 192.168.130.0/24: .internal.staging.swh.network + 192.168.50.0/24: .internal.admin.swh.network backups::legacy_storage: /srv/backups backups::enable: true diff --git a/data/hostname/db0.internal.staging.swh.network.yaml b/data/hostname/db0.internal.staging.swh.network.yaml --- a/data/hostname/db0.internal.staging.swh.network.yaml +++ b/data/hostname/db0.internal.staging.swh.network.yaml @@ -1,9 +1,9 @@ --- networks: eth0: - address: 192.168.128.3 + address: 192.168.130.10 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 swh::dbs: storage: @@ -25,13 +25,13 @@ postgres::server::port: 5433 postgres::server::listen_addresses: - localhost - - 192.168.128.3 + - 192.168.130.10 postgres::server::network_access: - - 192.168.100.0/24 - - 192.168.128.0/24 + - 192.168.100.0/24 # Monitoring + - 192.168.130.0/24 # Staging services pgbouncer::auth_hba_file: /etc/postgresql/11/main/pg_hba.conf -pgbouncer::listen_addr: 192.168.128.3 +pgbouncer::listen_addr: 192.168.130.10 pgbouncer::databases: - source_db: swh host: localhost diff --git a/data/hostname/deposit.internal.staging.swh.network.yaml b/data/hostname/deposit.internal.staging.swh.network.yaml --- a/data/hostname/deposit.internal.staging.swh.network.yaml +++ b/data/hostname/deposit.internal.staging.swh.network.yaml @@ -1,18 +1,18 @@ networks: eth0: - address: 192.168.128.7 + address: 192.168.130.31 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 ## db setup postgres::server::port: 5433 postgres::server::listen_addresses: - localhost - - 192.168.128.7 + - 192.168.130.31 postgres::server::network_access: - - 192.168.100.0/24 - - 192.168.128.0/24 + - 192.168.100.0/24 # Monitoring + - 192.168.130.0/24 # Staging services # Dbs to create swh::dbs: @@ -21,7 +21,7 @@ user: swh-deposit pgbouncer::auth_hba_file: /etc/postgresql/11/main/pg_hba.conf -pgbouncer::listen_addr: 192.168.128.7 +pgbouncer::listen_addr: 192.168.130.31 pgbouncer::databases: - source_db: swh-deposit host: localhost diff --git a/data/hostname/scheduler0.internal.staging.swh.network.yaml b/data/hostname/scheduler0.internal.staging.swh.network.yaml --- a/data/hostname/scheduler0.internal.staging.swh.network.yaml +++ b/data/hostname/scheduler0.internal.staging.swh.network.yaml @@ -1,8 +1,8 @@ networks: eth0: - address: 192.168.128.4 + address: 192.168.130.50 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 backups::exclude: - var/lib/rabbitmq @@ -12,4 +12,3 @@ swh::deploy::scheduler::remote::backend::listen::host: 0.0.0.0 swh::deploy::scheduler::task_broker: "amqp://guest:guest@127.0.0.1:5672/%2f" - diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml --- a/data/hostname/storage0.internal.staging.swh.network.yaml +++ b/data/hostname/storage0.internal.staging.swh.network.yaml @@ -1,8 +1,8 @@ networks: eth0: - address: 192.168.128.2 + address: 192.168.130.40 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 swh::postgres::service::users: - swhstorage diff --git a/data/hostname/webapp.internal.staging.swh.network.yaml b/data/hostname/webapp.internal.staging.swh.network.yaml --- a/data/hostname/webapp.internal.staging.swh.network.yaml +++ b/data/hostname/webapp.internal.staging.swh.network.yaml @@ -1,8 +1,8 @@ networks: eth0: - address: 192.168.128.8 + address: 192.168.130.30 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 hitch::frontend: "[*]:443" hitch::proxy_support: true @@ -26,7 +26,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 129.168.128.0/24 + - 129.168.130.0/24 swh_api_origin_search: limiter_rate: default: 10/m @@ -39,7 +39,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 192.168.128.0/24 + - 192.168.130.0/24 swh_vault_cooking: limiter_rate: default: 120/h @@ -47,7 +47,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 192.168.128.0/24 + - 192.168.130.0/24 swh_save_origin: limiter_rate: default: 120/h @@ -55,7 +55,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 129.168.128.0/24 + - 129.168.130.0/24 swh::deploy::webapp::config::keycloak: server_url: "https://%{hiera('keycloak::vhost::name')}/auth/" realm_name: SoftwareHeritageStaging diff --git a/data/hostname/worker0.internal.staging.swh.network.yaml b/data/hostname/worker0.internal.staging.swh.network.yaml --- a/data/hostname/worker0.internal.staging.swh.network.yaml +++ b/data/hostname/worker0.internal.staging.swh.network.yaml @@ -1,5 +1,5 @@ networks: eth0: - address: 192.168.128.5 + address: 192.168.130.100 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 diff --git a/data/hostname/worker1.internal.staging.swh.network.yaml b/data/hostname/worker1.internal.staging.swh.network.yaml --- a/data/hostname/worker1.internal.staging.swh.network.yaml +++ b/data/hostname/worker1.internal.staging.swh.network.yaml @@ -1,5 +1,5 @@ networks: eth0: - address: 192.168.128.6 + address: 192.168.130.101 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 diff --git a/data/hostname/worker2.internal.staging.swh.network.yaml b/data/hostname/worker2.internal.staging.swh.network.yaml --- a/data/hostname/worker2.internal.staging.swh.network.yaml +++ b/data/hostname/worker2.internal.staging.swh.network.yaml @@ -1,5 +1,5 @@ networks: eth0: - address: 192.168.128.11 + address: 192.168.130.102 netmask: 255.255.255.0 - gateway: 192.168.128.1 + gateway: 192.168.130.1 diff --git a/data/subnets/sesi_rocquencourt_staging.yaml b/data/subnets/sesi_rocquencourt_staging.yaml --- a/data/subnets/sesi_rocquencourt_staging.yaml +++ b/data/subnets/sesi_rocquencourt_staging.yaml @@ -18,6 +18,6 @@ - sesi-ntp1.inria.fr - sesi-ntp2.inria.fr -internal_network: 192.168.128.0/24 +internal_network: 192.168.130.0/24 smtp::relay_hostname: 'smtp.inria.fr'