diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml new file mode 100644 index 00000000..507383f8 --- /dev/null +++ b/data/hostname/storage0.internal.staging.swh.network.yaml @@ -0,0 +1,37 @@ +networks: + private: + interface: eth0 + address: 192.168.100.125 + netmask: 255.255.255.0 + gateway: 192.168.100.1 + +# Deploy the storage server as a public resource +swh::deploy::storage::backend::listen::host: 0.0.0.0 +swh::deploy::storage::backend::workers: 4 +swh::deploy::storage::backend::max_requests: 100 +swh::deploy::storage::backend::max_requests_jitter: 10 +swh::deploy::storage::config: + storage: + cls: local + args: + db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}" + objstorage: + cls: pathslicing + args: + root: "%{hiera('swh::deploy::storage::directory')}" + slicing: "0:1/1:5" + +# Deploy the indexer storage server as a public resource +swh::deploy::indexer::storage::backend::listen::host: 0.0.0.0 +swh::deploy::indexer::storage::backend::workers: 4 +swh::deploy::indexer::storage::config: + indexer_storage: + cls: local + args: + db: "host=%{hiera('swh::deploy::indexer::storage::db::host')} port=%{hiera('swh::deploy::indexer::storage::db::port')} user=%{hiera('swh::deploy::indexer::storage::db::user')} dbname=%{hiera('swh::deploy::indexer::storage::db::dbname')} password=%{hiera('swh::deploy::indexer::storage::db::password')}" + +# open objstorage api +swh::deploy::objstorage::backend::listen::host: 0.0.0.0 +swh::deploy::objstorage::backend::workers: 4 + +nginx::worker_processes: 4 diff --git a/manifests/site.pp b/manifests/site.pp index c34a829c..c70cba6d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,116 +1,120 @@ node 'louvre.internal.softwareheritage.org' { include role::swh_server } node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/ { include role::swh_hypervisor } node 'pergamon.softwareheritage.org' { include role::swh_sysadmin include profile::export_archive_counters } node 'tate.softwareheritage.org' { include role::swh_forge } node 'moma.softwareheritage.org' { include role::swh_api } node 'webapp0.softwareheritage.org' { include role::swh_base_api } node 'saatchi.internal.softwareheritage.org' { include role::swh_scheduler } node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database include profile::pgbouncer } node 'banco.softwareheritage.org' { include role::swh_backup include role::postgresql_backup } node /^esnode\d+.(internal.)?softwareheritage.org$/ { include role::swh_elasticsearch } node /^(unibo-test).(internal.)?softwareheritage.org$/ { include role::swh_vault_test } node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ { include role::swh_vault } node /^uffizi\.(internal\.)?softwareheritage\.org$/ { include role::swh_storage_baremetal } node /^storage\d+\.[^.]+\.azure\.internal\.softwareheritage\.org$/ { include role::swh_storage } +node /^storage0\.internal\.staging\.swh\.network$/ { + include role::swh_base_storage +} + node /^getty.(internal.)?softwareheritage.org$/ { include role::swh_eventlog } node /^worker\d+\.(internal\.)?softwareheritage\.org$/ { include role::swh_worker_inria } node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ { include role::swh_worker_azure } node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ { include role::swh_database } node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_osd } node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_mon } node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ { include role::swh_nameserver_secondary } node 'thyssen.internal.softwareheritage.org' { include role::swh_ci_server } node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ { include role::swh_ci_agent_debian } node 'logstash0.internal.softwareheritage.org' { include role::swh_logstash_instance } node 'kibana0.internal.softwareheritage.org' { include role::swh_kibana_instance } node 'munin0.internal.softwareheritage.org' { include role::swh_munin_master } node 'giverny.softwareheritage.org' { include role::swh_desktop } node default { include role::swh_base include profile::puppet::agent } diff --git a/site-modules/role/manifests/swh_storage.pp b/site-modules/role/manifests/swh_base_storage.pp similarity index 62% copy from site-modules/role/manifests/swh_storage.pp copy to site-modules/role/manifests/swh_base_storage.pp index 7d854b00..40a53b46 100644 --- a/site-modules/role/manifests/swh_storage.pp +++ b/site-modules/role/manifests/swh_base_storage.pp @@ -1,7 +1,6 @@ -class role::swh_storage inherits role::swh_server { +class role::swh_base_storage inherits role::swh_server { include profile::puppet::agent include profile::swh::deploy::storage include profile::swh::deploy::indexer_storage include profile::swh::deploy::objstorage - include profile::swh::deploy::objstorage_ceph } diff --git a/site-modules/role/manifests/swh_storage.pp b/site-modules/role/manifests/swh_storage.pp index 7d854b00..e93addb6 100644 --- a/site-modules/role/manifests/swh_storage.pp +++ b/site-modules/role/manifests/swh_storage.pp @@ -1,7 +1,3 @@ -class role::swh_storage inherits role::swh_server { - include profile::puppet::agent - include profile::swh::deploy::storage - include profile::swh::deploy::indexer_storage - include profile::swh::deploy::objstorage +class role::swh_storage inherits role::swh_base_storage { include profile::swh::deploy::objstorage_ceph }