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.

Sign up for GitHub

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

Use external mcg endpoint in bucket utils #9733

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Use external mcg endpoint in bucket utils #9733

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55c2e41
use external mcg endpoint in bucket utils
fbalak Apr 26, 2024
c8f821d
use external mcg endpoint when provider client
fbalak May 2, 2024
8328815
use s3_endpoint instead of s3_external_endpoint
fbalak May 2, 2024
82907bb
determine s3 endpoint in mcg object
fbalak May 6, 2024
0d78d5b
fix self reference and number of values to unpack
fbalak May 6, 2024
3bad5e5
Merge branch 'master' into mcg-external-endpoint
fbalak Nov 4, 2024
4f32975
fix missing variable
fbalak Nov 4, 2024
0faef55
reverse condition
fbalak Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into mcg-external-endpoint
  • Loading branch information
@fbalak
fbalak authored Nov 4, 2024
commit 3bad5e5059b65786379a8b0719a3c87bec61fa6f
7 changes: 6 additions & 1 deletion ocs_ci/ocs/bucket_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def craft_s3_command(cmd, mcg_obj=None, api=False, signed_request_creds=None):
f"{region}"
f"aws s3{api} "
f"--endpoint={mcg_obj.s3_endpoint} "
f"{no_ssl} "
)
string_wrapper = '"'
elif signed_request_creds:
Expand Down Expand Up @@ -111,7 +112,11 @@ def craft_s3cmd_command(cmd, mcg_obj=None, signed_request_creds=None):
f"s3cmd --access_key={mcg_obj.access_key_id} "
f"--secret_key={mcg_obj.access_key} "
f"{region}"
f"--host={mcg_obj.s3_endpoint} "
f"--host={mcg_obj.



} "
f"--host-bucket={mcg_obj.s3_endpoint} "
f"{no_ssl} "
)
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.