Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F9696819
D691.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Subscribers
None
D691.diff
View Options
diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1960,6 +1960,7 @@
objstorage: "%{alias('swh::remote_service::objstorage::config')}"
storage: "%{alias('swh::remote_service::storage::config::azure')}"
+swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file: "indexer/origin_intrinsic_metadata.yml"
swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::concurrency: 1
swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}"
# Contains a password: in private data
@@ -1968,6 +1969,7 @@
scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
objstorage: "%{alias('swh::remote_service::objstorage::config')}"
+ storage: "%{alias('swh::remote_service::storage::config::azure')}"
swh::deploy::worker::swh_indexer::origin_head::config_file: "indexer/origin_head.yml"
swh::deploy::worker::swh_indexer::origin_head::concurrency: 1
@@ -1982,6 +1984,7 @@
revision_metadata: null
origin_intrinsic_metadata: null
+swh::deploy::worker::swh_indexer::revision_metadata::config_file: "indexer/revision_metadata.yml"
swh::deploy::worker::swh_indexer::revision_metadata::concurrency: 3
swh::deploy::worker::swh_indexer::revision_metadata::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}"
# Contains a password: in private data
@@ -1990,6 +1993,7 @@
scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}"
indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
objstorage: "%{alias('swh::remote_service::objstorage::config')}"
+ storage: "%{alias('swh::remote_service::storage::config::azure')}"
swh::deploy::worker::swh_indexer::rehash::concurrency: 5
swh::deploy::worker::swh_indexer::rehash::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}"
diff --git a/data/location/azure_euwest.yaml b/data/location/azure_euwest.yaml
--- a/data/location/azure_euwest.yaml
+++ b/data/location/azure_euwest.yaml
@@ -18,6 +18,8 @@
- swh_indexer_mimetype
- swh_indexer_fossology_license
- swh_indexer_origin_head
+ - swh_indexer_revision_metadata
+ - swh_indexer_origin_intrinsic_metadata
swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::azure')}"
swh::remote_service::objstorage::config: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}"
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp
@@ -7,7 +7,9 @@
$loglevel = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::loglevel')
$task_broker = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::task_broker')
- $config_file = '/etc/softwareheritage/indexer/origin_intrinsic_metadata.yml'
+ $config_file = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config_file')
+ $config_directory = lookup('swh::conf_directory')
+ $config_path = "${config_directory}/${config_file}"
$config = lookup('swh::deploy::worker::swh_indexer::origin_intrinsic_metadata::config')
$task_modules = ['swh.indexer.tasks']
@@ -23,11 +25,11 @@
require => [
Class['profile::swh::deploy::indexer'],
Class['profile::swh::deploy::objstorage_cloud'],
- File[$config_file],
+ File[$config_path],
],
}
- file {$config_file:
+ file {$config_path:
ensure => 'present',
owner => 'swhworker',
group => 'swhdev',
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_revision_metadata.pp
@@ -7,7 +7,9 @@
$loglevel = lookup('swh::deploy::worker::swh_indexer::revision_metadata::loglevel')
$task_broker = lookup('swh::deploy::worker::swh_indexer::revision_metadata::task_broker')
- $config_file = '/etc/softwareheritage/indexer/revision_metadata.yml'
+ $config_file = lookup('swh::deploy::worker::swh_indexer::revision_metadata::config_file')
+ $config_directory = lookup('swh::conf_directory')
+ $config_path = "${config_directory}/${config_file}"
$config = lookup('swh::deploy::worker::swh_indexer::revision_metadata::config')
$task_modules = ['swh.indexer.tasks']
@@ -23,11 +25,11 @@
require => [
Class['profile::swh::deploy::indexer'],
Class['profile::swh::deploy::objstorage_cloud'],
- File[$config_file],
+ File[$config_path],
],
}
- file {$config_file:
+ file {$config_path:
ensure => 'present',
owner => 'swhworker',
group => 'swhdev',
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Aug 17, 9:39 PM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3227982
Attached To
D691: Deploy metadata indexers
Event Timeline
Log In to Comment