diff --git a/data/hostname/orangerie.internal.softwareheritage.org.yaml b/data/hostname/orangerie.internal.softwareheritage.org.yaml index f7740ed4..54f00f2a 100644 --- a/data/hostname/orangerie.internal.softwareheritage.org.yaml +++ b/data/hostname/orangerie.internal.softwareheritage.org.yaml @@ -1,7 +1,5 @@ ssh::port: 7022 -# open objstorage api -swh::deploy::objstorage::backend::listen::host: 0.0.0.0 swh::deploy::objstorage::directory: "%{hiera('swh::deploy::vault::cache')}" swh::deploy::vault::backend::listen::host: 0.0.0.0 diff --git a/data/hostname/orangeriedev.internal.softwareheritage.org.yaml b/data/hostname/orangeriedev.internal.softwareheritage.org.yaml index 9e1849d2..c838832c 100644 --- a/data/hostname/orangeriedev.internal.softwareheritage.org.yaml +++ b/data/hostname/orangeriedev.internal.softwareheritage.org.yaml @@ -1,16 +1,14 @@ ssh::port: 7022 -# open objstorage api -swh::deploy::objstorage::backend::listen::host: 0.0.0.0 swh::deploy::objstorage::directory: "%{hiera('swh::deploy::vault::cache')}" swh::deploy::vault::db::host: orangeriedev swh::deploy::vault::backend::listen::host: 0.0.0.0 # Don't use a worker for now as this will conflict with the production workers # because they have the same queue names. # # swh::deploy::worker::instances: # - vault_cooker # swh::deploy::worker::vault_cooker::vault_url: "http://orangeriedev.internal.softwareheritage.org:5005/" swh::deploy::worker::instances: [] diff --git a/site-modules/role/manifests/swh_vault.pp b/site-modules/role/manifests/swh_vault.pp index e4fde109..41c9c7e7 100644 --- a/site-modules/role/manifests/swh_vault.pp +++ b/site-modules/role/manifests/swh_vault.pp @@ -1,6 +1,4 @@ class role::swh_vault inherits role::swh_server { include profile::puppet::agent include profile::swh::deploy::vault - - include profile::swh::deploy::objstorage }