diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1103,14 +1103,6 @@ type: A record: giverny.internal.softwareheritage.org data: 192.168.101.118 - orangeriedev/A: - type: A - record: orangeriedev.internal.softwareheritage.org - data: 192.168.101.130 - orangerie/A: - type: A - record: orangerie.internal.softwareheritage.org - data: 192.168.101.142 ddouard-desktop/A: record: ddouard-desktop.internal.softwareheritage.org data: 192.168.101.162 @@ -1791,7 +1783,7 @@ message.max.bytes: 1000000000 swh::deploy::vault::cache: "%{hiera('swh::base_directory')}/vault_cache" -# Default cache (orangerie/orangeriedev) is a pathslicing objstorage +# Default cache a pathslicing objstorage swh::deploy::vault::config::cache: cls: pathslicing root: "%{hiera('swh::deploy::vault::cache')}" diff --git a/data/hostname/orangerie.internal.softwareheritage.org.yaml b/data/hostname/orangerie.internal.softwareheritage.org.yaml deleted file mode 100644 --- a/data/hostname/orangerie.internal.softwareheritage.org.yaml +++ /dev/null @@ -1,5 +0,0 @@ -ssh::port: 7022 - -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 deleted file mode 100644 --- a/data/hostname/orangeriedev.internal.softwareheritage.org.yaml +++ /dev/null @@ -1,15 +0,0 @@ -ssh::port: 7022 - -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: [] -swh::deploy::vault::db::port: 5432