Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libcloud plugin: libcloud storage provider config #1226

Merged
merged 6 commits into from Aug 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -135,6 +135,7 @@ Martin Simmons
Martin Skuta
Matt Richards
Matthew Ife
Matthias Kneer
Max Meyer
Meno Abels
Michael -buk- Scherer
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Expand Up @@ -39,10 +39,11 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
- build: Add support for Ubuntu 22.04, Fedora 36, EL 9, openSUSE 15.4 [PR #1179]
- tests: skip mysql tests if root [PR #1197]
- build: Add support for SLE_15_SP4 [PR #1205]
- libcloud plugin: allow to configure the storage provider [PR #1226]

### Fixed
- dird: RunScript fixes [PR #1217]
- fix show command output for RunScript RunsOnClient
- fix show command output for RunScript RunsOnClient
- fix show verbose for RunScripts
- execute console runscripts only on the Director
- python plugins: store architecture specific modules in sitearch (instead of sitelib) [PR #698]
Expand Down Expand Up @@ -202,6 +203,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
[PR #1140]: https://github.com/bareos/bareos/pull/1140
[PR #1147]: https://github.com/bareos/bareos/pull/1147
[PR #1149]: https://github.com/bareos/bareos/pull/1149
[PR #1151]: https://github.com/bareos/bareos/pull/1151
[PR #1152]: https://github.com/bareos/bareos/pull/1152
[PR #1153]: https://github.com/bareos/bareos/pull/1153
[PR #1154]: https://github.com/bareos/bareos/pull/1154
Expand All @@ -220,6 +222,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
[PR #1183]: https://github.com/bareos/bareos/pull/1183
[PR #1185]: https://github.com/bareos/bareos/pull/1185
[PR #1187]: https://github.com/bareos/bareos/pull/1187
[PR #1188]: https://github.com/bareos/bareos/pull/1188
[PR #1189]: https://github.com/bareos/bareos/pull/1189
[PR #1192]: https://github.com/bareos/bareos/pull/1192
[PR #1193]: https://github.com/bareos/bareos/pull/1193
Expand All @@ -231,4 +234,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
[PR #1206]: https://github.com/bareos/bareos/pull/1206
[PR #1209]: https://github.com/bareos/bareos/pull/1209
[PR #1217]: https://github.com/bareos/bareos/pull/1217
[PR #1218]: https://github.com/bareos/bareos/pull/1218
[PR #1221]: https://github.com/bareos/bareos/pull/1221
[PR #1226]: https://github.com/bareos/bareos/pull/1226
[unreleased]: https://github.com/bareos/bareos/tree/master
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2020-2020 Bareos GmbH & Co. KG
# Copyright (C) 2020-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -34,6 +34,11 @@
def get_driver(options):
driver_opt = dict(options)

try:
provider_opt = driver_opt.get("provider")
except KeyError:
provider_opt = "S3"

# remove unknown options
for opt in (
"buckets_exclude",
Expand All @@ -50,7 +55,7 @@ def get_driver(options):

driver = None

provider = getattr(libcloud.storage.types.Provider, "S3")
provider = getattr(libcloud.storage.types.Provider, provider_opt)
driver = libcloud.storage.providers.get_driver(provider)(**driver_opt)

try:
Expand Down
Expand Up @@ -125,7 +125,7 @@ tls
Use Transport encryption, if supported by the backend

provider
The provider string, currently only 'S3'
The provider string, 'S3' being the default if not specified

username
The username to use for backups
Expand Down