Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Pull request #34: Aws region

Browse Source 
Merge in RR/pyinfra from aws_region to master

Squashed commit of the following:

commit 7d5513e8b2e46218fe6f030abf99cc05b3fed7f5
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Apr 28 16:08:20 2022 +0200

    changed test bucket

commit caba7b503edbc6147aa69f8044ac92a81e768abd
Merge: e76f0ab 52acc30
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Apr 28 15:30:57 2022 +0200

    Merge branch 'master' of ssh://git.iqser.com:2222/rr/pyinfra into aws_region

commit e76f0ab1f29b774d9297453c82b3b5749ea4cb44
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Apr 28 15:30:19 2022 +0200

    changed test bucket

commit 29b15be9337fb409f6a0bfbb29026baa4bbe7236
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Apr 28 15:08:43 2022 +0200

    added aws region to config
This commit is contained in:
Matthias Bisping 2022-04-28 16:29:15 +02:00
parent 52acc3080e
commit 0e47ba61c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -23,7 +23,7 @@ rabbitmq:
storage:
backend: $STORAGE_BACKEND|s3 # The type of storage to use {s3, azure}
bucket: "STORAGE_BUCKET_NAME|STORAGE_AZURECONTAINERNAME|pyinfra-test-bucket2" # The bucket / container to pull files specified in queue requests from
bucket: "STORAGE_BUCKET_NAME|STORAGE_AZURECONTAINERNAME|pyinfra-test-bucket" # The bucket / container to pull files specified in queue requests from
s3:
endpoint: $STORAGE_ENDPOINT|"http://127.0.0.1:9000"

2
test/unit_tests/conftest.py
View File

@ -28,7 +28,7 @@ logger.setLevel(logging.DEBUG)
@pytest.fixture(scope="session")
def bucket_name():
return "pyinfra-test-bucket2"
return "pyinfra-test-bucket"
@pytest.fixture